incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1354497 [33/33] - in /incubator/ooo/branches/alg/aw080: ./ ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/coinmp/ ext_libraries/serf/ ext_libraries/serf/prj/ ext_libraries/serf/win/ ext_sources/ main/ main/animations/source/animc...
Date Wed, 27 Jun 2012 13:45:34 GMT
Modified: incubator/ooo/branches/alg/aw080/main/vcl/source/src/throbber.src
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/source/src/throbber.src?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/source/src/throbber.src (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/source/src/throbber.src Wed Jun 27 13:44:09 2012
@@ -19,93 +19,335 @@
  * 
  *************************************************************/
 
+#define _SV_THROBBER_SRC
 
+#include <svids.hrc>
+
+#define THROBBER_16     SV_RESID_BITMAP_THROBBER_START
+#define THROBBER_16_HC  THROBBER_16     + 6
+#define THROBBER_32     THROBBER_16_HC  + 6
+#define THROBBER_32_HC  THROBBER_32     + 12
+#define THROBBER_64     THROBBER_32_HC  + 12
+#define THROBBER_64_HC  THROBBER_64     + 12
 
 // TODO: we need a mechanism to add images to images.zip, *without*
 // referring them in resource files. The below resources are never loaded
 // at runtime, instead, the images in images.zip are accessed via
 // private:graphicrepository/* URLs.
 
-Resource 1000
+
+Bitmap (THROBBER_16 + 1)
+{
+    file = "spinner-16-01.png";
+};
+
+Bitmap (THROBBER_16 + 2)
+{
+    file = "spinner-16-02.png";
+};
+
+Bitmap (THROBBER_16 + 3)
+{
+    file = "spinner-16-03.png";
+};
+
+Bitmap (THROBBER_16 + 4)
+{
+    file = "spinner-16-04.png";
+};
+
+Bitmap (THROBBER_16 + 5)
+{
+    file = "spinner-16-05.png";
+};
+
+Bitmap (THROBBER_16 + 6)
+{
+    file = "spinner-16-06.png";
+};
+
+
+
+
+Bitmap (THROBBER_16_HC + 1)
+{
+    file = "spinner-16-01_h.png";
+};
+
+Bitmap (THROBBER_16_HC + 2)
+{
+    file = "spinner-16-02_h.png";
+};
+
+Bitmap (THROBBER_16_HC + 3)
+{
+    file = "spinner-16-03_h.png";
+};
+
+Bitmap (THROBBER_16_HC + 4)
+{
+    file = "spinner-16-04_h.png";
+};
+
+Bitmap (THROBBER_16_HC + 5)
+{
+    file = "spinner-16-05_h.png";
+};
+
+Bitmap (THROBBER_16_HC + 6)
+{
+    file = "spinner-16-06_h.png";
+};
+
+
+
+
+Bitmap (THROBBER_32 + 1)
+{
+    file = "spinner-32-01.png";
+};
+
+Bitmap (THROBBER_32 + 2)
+{
+    file = "spinner-32-02.png";
+};
+
+Bitmap (THROBBER_32 + 3)
+{
+    file = "spinner-32-03.png";
+};
+
+Bitmap (THROBBER_32 + 4)
+{
+    file = "spinner-32-04.png";
+};
+
+Bitmap (THROBBER_32 + 5)
+{
+    file = "spinner-32-05.png";
+};
+
+Bitmap (THROBBER_32 + 6)
+{
+    file = "spinner-32-06.png";
+};
+
+Bitmap (THROBBER_32 + 7)
+{
+    file = "spinner-32-07.png";
+};
+
+Bitmap (THROBBER_32 + 8)
+{
+    file = "spinner-32-08.png";
+};
+
+Bitmap (THROBBER_32 + 9)
+{
+    file = "spinner-32-09.png";
+};
+
+Bitmap (THROBBER_32 + 10)
+{
+    file = "spinner-32-10.png";
+};
+
+Bitmap (THROBBER_32 + 11)
+{
+    file = "spinner-32-11.png";
+};
+
+Bitmap (THROBBER_32 + 12)
+{
+    file = "spinner-32-12.png";
+};
+
+
+
+
+Bitmap (THROBBER_32_HC + 1)
+{
+    file = "spinner-32-01_h.png";
+};
+
+Bitmap (THROBBER_32_HC + 2)
+{
+    file = "spinner-32-02_h.png";
+};
+
+Bitmap (THROBBER_32_HC + 3)
+{
+    file = "spinner-32-03_h.png";
+};
+
+Bitmap (THROBBER_32_HC + 4)
+{
+    file = "spinner-32-04_h.png";
+};
+
+Bitmap (THROBBER_32_HC + 5)
+{
+    file = "spinner-32-05_h.png";
+};
+
+Bitmap (THROBBER_32_HC + 6)
 {
-    Image 1 { ImageBitmap = Bitmap{ file = "shared/spinner-16-01.png"; }; };
-    Image 2 { ImageBitmap = Bitmap{ file = "shared/spinner-16-02.png"; }; };
-    Image 3 { ImageBitmap = Bitmap{ file = "shared/spinner-16-03.png"; }; };
-    Image 4 { ImageBitmap = Bitmap{ file = "shared/spinner-16-04.png"; }; };
-    Image 5 { ImageBitmap = Bitmap{ file = "shared/spinner-16-05.png"; }; };
-    Image 6 { ImageBitmap = Bitmap{ file = "shared/spinner-16-06.png"; }; };
-};
-
-Resource 1001
-{
-    Image 1 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-16-01.png"; }; };
-    Image 2 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-16-02.png"; }; };
-    Image 3 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-16-03.png"; }; };
-    Image 4 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-16-04.png"; }; };
-    Image 5 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-16-05.png"; }; };
-    Image 6 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-16-06.png"; }; };
-};
-
-Resource 1002
-{
-    Image  1 { ImageBitmap = Bitmap{ file = "shared/spinner-32-01.png"; }; };
-    Image  2 { ImageBitmap = Bitmap{ file = "shared/spinner-32-02.png"; }; };
-    Image  3 { ImageBitmap = Bitmap{ file = "shared/spinner-32-03.png"; }; };
-    Image  4 { ImageBitmap = Bitmap{ file = "shared/spinner-32-04.png"; }; };
-    Image  5 { ImageBitmap = Bitmap{ file = "shared/spinner-32-05.png"; }; };
-    Image  6 { ImageBitmap = Bitmap{ file = "shared/spinner-32-06.png"; }; };
-    Image  7 { ImageBitmap = Bitmap{ file = "shared/spinner-32-07.png"; }; };
-    Image  8 { ImageBitmap = Bitmap{ file = "shared/spinner-32-08.png"; }; };
-    Image  9 { ImageBitmap = Bitmap{ file = "shared/spinner-32-09.png"; }; };
-    Image 10 { ImageBitmap = Bitmap{ file = "shared/spinner-32-10.png"; }; };
-    Image 11 { ImageBitmap = Bitmap{ file = "shared/spinner-32-11.png"; }; };
-    Image 12 { ImageBitmap = Bitmap{ file = "shared/spinner-32-12.png"; }; };
-};
-
-Resource 1003
-{
-    Image  1 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-01.png"; }; };
-    Image  2 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-02.png"; }; };
-    Image  3 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-03.png"; }; };
-    Image  4 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-04.png"; }; };
-    Image  5 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-05.png"; }; };
-    Image  6 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-06.png"; }; };
-    Image  7 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-07.png"; }; };
-    Image  8 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-08.png"; }; };
-    Image  9 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-09.png"; }; };
-    Image 10 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-10.png"; }; };
-    Image 11 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-11.png"; }; };
-    Image 12 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-12.png"; }; };
-};
-
-Resource 1004
-{
-    Image  1 { ImageBitmap = Bitmap{ file = "shared/spinner-64-01.png"; }; };
-    Image  2 { ImageBitmap = Bitmap{ file = "shared/spinner-64-02.png"; }; };
-    Image  3 { ImageBitmap = Bitmap{ file = "shared/spinner-64-03.png"; }; };
-    Image  4 { ImageBitmap = Bitmap{ file = "shared/spinner-64-04.png"; }; };
-    Image  5 { ImageBitmap = Bitmap{ file = "shared/spinner-64-05.png"; }; };
-    Image  6 { ImageBitmap = Bitmap{ file = "shared/spinner-64-06.png"; }; };
-    Image  7 { ImageBitmap = Bitmap{ file = "shared/spinner-64-07.png"; }; };
-    Image  8 { ImageBitmap = Bitmap{ file = "shared/spinner-64-08.png"; }; };
-    Image  9 { ImageBitmap = Bitmap{ file = "shared/spinner-64-09.png"; }; };
-    Image 10 { ImageBitmap = Bitmap{ file = "shared/spinner-64-10.png"; }; };
-    Image 11 { ImageBitmap = Bitmap{ file = "shared/spinner-64-11.png"; }; };
-    Image 12 { ImageBitmap = Bitmap{ file = "shared/spinner-64-12.png"; }; };
-};
-
-Resource 1005
-{
-    Image  1 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-01.png"; }; };
-    Image  2 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-02.png"; }; };
-    Image  3 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-03.png"; }; };
-    Image  4 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-04.png"; }; };
-    Image  5 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-05.png"; }; };
-    Image  6 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-06.png"; }; };
-    Image  7 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-07.png"; }; };
-    Image  8 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-08.png"; }; };
-    Image  9 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-09.png"; }; };
-    Image 10 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-10.png"; }; };
-    Image 11 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-11.png"; }; };
-    Image 12 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-12.png"; }; };
+    file = "spinner-32-06_h.png";
 };
+
+Bitmap (THROBBER_32_HC + 7)
+{
+    file = "spinner-32-07_h.png";
+};
+
+Bitmap (THROBBER_32_HC + 8)
+{
+    file = "spinner-32-08_h.png";
+};
+
+Bitmap (THROBBER_32_HC + 9)
+{
+    file = "spinner-32-09_h.png";
+};
+
+Bitmap (THROBBER_32_HC + 10)
+{
+    file = "spinner-32-10_h.png";
+};
+
+Bitmap (THROBBER_32_HC + 11)
+{
+    file = "spinner-32-11_h.png";
+};
+
+Bitmap (THROBBER_32_HC + 12)
+{
+    file = "spinner-32-12_h.png";
+};
+
+
+
+Bitmap (THROBBER_64 + 1)
+{
+    file = "spinner-64-01.png";
+};
+
+Bitmap (THROBBER_64 + 2)
+{
+    file = "spinner-64-02.png";
+};
+
+Bitmap (THROBBER_64 + 3)
+{
+    file = "spinner-64-03.png";
+};
+
+Bitmap (THROBBER_64 + 4)
+{
+    file = "spinner-64-04.png";
+};
+
+Bitmap (THROBBER_64 + 5)
+{
+    file = "spinner-64-05.png";
+};
+
+Bitmap (THROBBER_64 + 6)
+{
+    file = "spinner-64-06.png";
+};
+
+Bitmap (THROBBER_64 + 7)
+{
+    file = "spinner-64-07.png";
+};
+
+Bitmap (THROBBER_64 + 8)
+{
+    file = "spinner-64-08.png";
+};
+
+Bitmap (THROBBER_64 + 9)
+{
+    file = "spinner-64-09.png";
+};
+
+Bitmap (THROBBER_64 + 10)
+{
+    file = "spinner-64-10.png";
+};
+
+Bitmap (THROBBER_64 + 11)
+{
+    file = "spinner-64-11.png";
+};
+
+Bitmap (THROBBER_64 + 12)
+{
+    file = "spinner-64-12.png";
+};
+
+
+
+
+Bitmap (THROBBER_64_HC + 1)
+{
+    file = "spinner-64-01_h.png";
+};
+
+Bitmap (THROBBER_64_HC + 2)
+{
+    file = "spinner-64-02_h.png";
+};
+
+Bitmap (THROBBER_64_HC + 3)
+{
+    file = "spinner-64-03_h.png";
+};
+
+Bitmap (THROBBER_64_HC + 4)
+{
+    file = "spinner-64-04_h.png";
+};
+
+Bitmap (THROBBER_64_HC + 5)
+{
+    file = "spinner-64-05_h.png";
+};
+
+Bitmap (THROBBER_64_HC + 6)
+{
+    file = "spinner-64-06_h.png";
+};
+
+Bitmap (THROBBER_64_HC + 7)
+{
+    file = "spinner-64-07_h.png";
+};
+
+Bitmap (THROBBER_64_HC + 8)
+{
+    file = "spinner-64-08_h.png";
+};
+
+Bitmap (THROBBER_64_HC + 9)
+{
+    file = "spinner-64-09_h.png";
+};
+
+Bitmap (THROBBER_64_HC + 10)
+{
+    file = "spinner-64-10_h.png";
+};
+
+Bitmap (THROBBER_64_HC + 11)
+{
+    file = "spinner-64-11_h.png";
+};
+
+Bitmap (THROBBER_64_HC + 12)
+{
+    file = "spinner-64-12_h.png";
+};
+
+

Modified: incubator/ooo/branches/alg/aw080/main/vcl/source/window/splitwin.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/source/window/splitwin.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/source/window/splitwin.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/source/window/splitwin.cxx Wed Jun 27 13:44:09 2012
@@ -96,7 +96,7 @@ struct ImplSplitSet
     size has not lower or upper bound.
 */
 namespace {
-    long ValidateSize (const long nSize, const ImplSplitItem rItem)
+    long ValidateSize (const long nSize, const ImplSplitItem& rItem)
     {
         if (rItem.mnMinSize>=0 && nSize<rItem.mnMinSize)
             return rItem.mnMinSize;

Modified: incubator/ooo/branches/alg/aw080/main/vcl/source/window/window.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/source/window/window.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/source/window/window.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/source/window/window.cxx Wed Jun 27 13:44:09 2012
@@ -148,12 +148,144 @@ ImplAccessibleInfos::~ImplAccessibleInfo
 
 // -----------------------------------------------------------------------
 
-WindowImpl::WindowImpl()
+WindowImpl::WindowImpl( WindowType nType )
 {
+	maZoom              = Fraction( 1, 1 );
+	maWinRegion         = Region( REGION_NULL );
+	maWinClipRegion                   = Region( REGION_NULL );
+	mpWinData           = NULL;         // Extra Window Data, that we dont need for all windows
+	mpOverlapData       = NULL;         // Overlap Data
+	mpFrameData         = NULL;         // Frame Data
+	mpFrame             = NULL;         // Pointer to frame window
+	mpSysObj            = NULL;
+	mpFrameWindow       = NULL;         // window to top level parent (same as frame window)
+	mpOverlapWindow     = NULL;         // first overlap parent
+	mpBorderWindow      = NULL;         // Border-Window
+	mpClientWindow      = NULL;         // Client-Window of a FrameWindow
+	mpParent            = NULL;         // parent (inkl. BorderWindow)
+	mpRealParent        = NULL;         // real parent (exkl. BorderWindow)
+	mpFirstChild        = NULL;         // first child window
+	mpLastChild         = NULL;         // last child window
+	mpFirstOverlap      = NULL;         // first overlap window (only set in overlap windows)
+	mpLastOverlap       = NULL;         // last overlap window (only set in overlap windows)
+	mpPrev              = NULL;         // prev window
+	mpNext              = NULL;         // next window
+	mpNextOverlap       = NULL;         // next overlap window of frame
+	mpLastFocusWindow   = NULL;         // window for focus restore
+	mpDlgCtrlDownWindow = NULL;         // window for dialog control
+	mpFirstDel          = NULL;         // Dtor notification list
+	mpUserData          = NULL;         // user data
+	mpExtImpl           = NULL;         // extended implementation data
+	mpCursor            = NULL;         // cursor
+	mpControlFont       = NULL;         // font propertie
+	mpVCLXWindow        = NULL;
+	mpAccessibleInfos   = NULL;
+	maControlForeground = Color( COL_TRANSPARENT );     // foreground color not set
+	maControlBackground = Color( COL_TRANSPARENT );     // background color not set
+	mnLeftBorder        = 0;            // left border
+	mnTopBorder         = 0;            // top border
+	mnRightBorder       = 0;            // right border
+	mnBottomBorder      = 0;            // bottom border
+	mnX                 = 0;            // X-Position to Parent
+	mnY                 = 0;            // Y-Position to Parent
+	mnAbsScreenX        = 0;            // absolute X-position on screen, used for RTL window positioning
+	mpChildClipRegion   = NULL;         // Child-Clip-Region when ClipChildren
+	mpPaintRegion       = NULL;         // Paint-ClipRegion
+	mnStyle             = 0;            // style (init in ImplInitWindow)
+	mnPrevStyle         = 0;            // prevstyle (set in SetStyle)
+	mnExtendedStyle     = 0;            // extended style (init in ImplInitWindow)
+	mnPrevExtendedStyle = 0;            // prevstyle (set in SetExtendedStyle)
+	mnType              = nType;        // window type
+	mnGetFocusFlags     = 0;            // Flags fuer GetFocus()-Aufruf
+	mnWaitCount         = 0;            // Wait-Count (>1 == Warte-MousePointer)
+	mnPaintFlags        = 0;            // Flags for ImplCallPaint
+	mnParentClipMode    = 0;            // Flags for Parent-ClipChildren-Mode
+	mnActivateMode      = 0;            // Wird bei System/Overlap-Windows umgesetzt
+	mnDlgCtrlFlags      = 0;            // DialogControl-Flags
+	mnLockCount         = 0;            // LockCount
+	meAlwaysInputMode   = AlwaysInputNone; // neither AlwaysEnableInput nor AlwaysDisableInput called
+	mbFrame             = sal_False;        // sal_True: Window is a frame window
+	mbBorderWin         = sal_False;        // sal_True: Window is a border window
+	mbOverlapWin        = sal_False;        // sal_True: Window is a overlap window
+	mbSysWin            = sal_False;        // sal_True: SystemWindow is the base class
+	mbDialog            = sal_False;        // sal_True: Dialog is the base class
+	mbDockWin           = sal_False;        // sal_True: DockingWindow is the base class
+	mbFloatWin          = sal_False;        // sal_True: FloatingWindow is the base class
+	mbPushButton        = sal_False;        // sal_True: PushButton is the base class
+	mbToolBox			= sal_False;		// sal_True: ToolBox is the base class
+	mbMenuFloatingWindow= sal_False;		// sal_True: MenuFloatingWindow is the base class
+	mbToolbarFloatingWindow= sal_False;		// sal_True: ImplPopupFloatWin is the base class, used for subtoolbars
+	mbSplitter			= sal_False;		// sal_True: Splitter is the base class
+	mbVisible           = sal_False;        // sal_True: Show( sal_True ) called
+	mbOverlapVisible    = sal_False;        // sal_True: Hide called for visible window from ImplHideAllOverlapWindow()
+	mbDisabled          = sal_False;        // sal_True: Enable( sal_False ) called
+	mbInputDisabled     = sal_False;        // sal_True: EnableInput( sal_False ) called
+	mbDropDisabled      = sal_False;        // sal_True: Drop is enabled
+	mbNoUpdate          = sal_False;        // sal_True: SetUpdateMode( sal_False ) called
+	mbNoParentUpdate    = sal_False;        // sal_True: SetParentUpdateMode( sal_False ) called
+	mbActive            = sal_False;        // sal_True: Window Active
+	mbParentActive      = sal_False;        // sal_True: OverlapActive from Parent
+	mbReallyVisible     = sal_False;        // sal_True: this and all parents to an overlaped window are visible
+	mbReallyShown       = sal_False;        // sal_True: this and all parents to an overlaped window are shown
+	mbInInitShow        = sal_False;        // sal_True: we are in InitShow
+	mbChildNotify       = sal_False;        // sal_True: ChildNotify
+	mbChildPtrOverwrite = sal_False;        // sal_True: PointerStyle overwrites Child-Pointer
+	mbNoPtrVisible      = sal_False;        // sal_True: ShowPointer( sal_False ) called
+	mbMouseMove         = sal_False;        // sal_True: BaseMouseMove called
+	mbPaintFrame        = sal_False;        // sal_True: Paint is visible, but not painted
+	mbInPaint           = sal_False;        // sal_True: Inside PaintHdl
+	mbMouseButtonDown   = sal_False;        // sal_True: BaseMouseButtonDown called
+	mbMouseButtonUp     = sal_False;        // sal_True: BaseMouseButtonUp called
+	mbKeyInput          = sal_False;        // sal_True: BaseKeyInput called
+	mbKeyUp             = sal_False;        // sal_True: BaseKeyUp called
+	mbCommand           = sal_False;        // sal_True: BaseCommand called
+	mbDefPos            = sal_True;         // sal_True: Position is not Set
+	mbDefSize           = sal_True;         // sal_True: Size is not Set
+	mbCallMove          = sal_True;         // sal_True: Move must be called by Show
+	mbCallResize        = sal_True;         // sal_True: Resize must be called by Show
+	mbWaitSystemResize  = sal_True;         // sal_True: Wait for System-Resize
+	mbInitWinClipRegion = sal_True;         // sal_True: Calc Window Clip Region
+	mbInitChildRegion   = sal_False;        // sal_True: InitChildClipRegion
+	mbWinRegion         = sal_False;        // sal_True: Window Region
+	mbClipChildren      = sal_False;        // sal_True: request that child-windows get clipped
+	mbClipSiblings      = sal_False;        // sal_True: request that sibling child-windows get clipped
+	mbChildTransparent  = sal_False;        // sal_True: allow child-windows to enable transparency (incl. Parent-CLIPCHILDREN)
+	mbPaintTransparent  = sal_False;        // sal_True: Paints muessen auf Parent ausgeloest werden
+	mbMouseTransparent  = sal_False;        // sal_True: Window is transparent for Mouse
+	mbDlgCtrlStart      = sal_False;        // sal_True: Ab hier eigenes Dialog-Control
+	mbFocusVisible      = sal_False;        // sal_True: Focus Visible
+	mbUseNativeFocus    = sal_False;
+	mbNativeFocusVisible= sal_False;        // sal_True: native Focus Visible
+	mbInShowFocus       = sal_False;        // prevent recursion
+	mbInHideFocus       = sal_False;        // prevent recursion
+	mbTrackVisible      = sal_False;        // sal_True: Tracking Visible
+	mbControlForeground = sal_False;        // sal_True: Foreground-Property set
+	mbControlBackground = sal_False;        // sal_True: Background-Property set
+	mbAlwaysOnTop       = sal_False;        // sal_True: window is always on top
+	mbCompoundControl   = sal_False;        // sal_True: Zusammengesetztes Control => Listener...
+	mbCompoundControlHasFocus = sal_False;  // sal_True: Zusammengesetztes Control hat irgendwo den Focus
+	mbPaintDisabled     = sal_False;        // sal_True: to disable paint events
+	mbAllResize         = sal_False;        // sal_True: to enable sending of ResizeEvents with both height=0 and width=0
+	mbInDtor            = sal_False;        // sal_True: is set when the window is being destructed
+	mbExtTextInput      = sal_False;        // sal_True: ExtTextInput-Mode is active
+	mbInFocusHdl        = sal_False;        // sal_True: is set when inside a  GetFocus-Handler context
+	mbCreatedWithToolkit = sal_False;
+	mbSuppressAccessibilityEvents = sal_False; // sal_True: do not send any accessibility events
+	mbDrawSelectionBackground = sal_False;    // sal_True: draws transparent window background to indicate (toolbox) selection
+	mbIsInTaskPaneList = sal_False;           // sal_True: window was added to the taskpanelist in the topmost system window
+	mnNativeBackground  = 0;              // initialize later, depends on type
+	mbCallHandlersDuringInputDisabled = sal_False; // sal_True: call event handlers even if input is disabled
+	mbDisableAccessibleLabelForRelation = sal_False; // sal_True: do not set LabelFor relation on accessible objects
+	mbDisableAccessibleLabeledByRelation = sal_False; // sal_True: do not set LabeledBy relation on accessible objects
+	mbHelpTextDynamic = sal_False;          // sal_True: append help id in HELP_DEBUG case
+	mbFakeFocusSet = sal_False; // sal_True: pretend as if the window has focus.
 }
 
 WindowImpl::~WindowImpl()
 {
+	delete mpChildClipRegion;
+	delete mpAccessibleInfos;
+	delete mpControlFont;
 }
 
 
@@ -584,140 +716,10 @@ CommandEvent ImplTranslateCommandEvent( 
 
 void Window::ImplInitWindowData( WindowType nType )
 {
-    mpWindowImpl = new WindowImpl;
+    mpWindowImpl = new WindowImpl( nType );
 
     meOutDevType        = OUTDEV_WINDOW;
 
-    mpWindowImpl->maZoom              = Fraction( 1, 1 );
-    mpWindowImpl->maWinRegion         = Region( REGION_NULL );
-    mpWindowImpl->maWinClipRegion                   = Region( REGION_NULL );
-    mpWindowImpl->mpWinData           = NULL;         // Extra Window Data, that we dont need for all windows
-    mpWindowImpl->mpOverlapData       = NULL;         // Overlap Data
-    mpWindowImpl->mpFrameData         = NULL;         // Frame Data
-    mpWindowImpl->mpFrame             = NULL;         // Pointer to frame window
-    mpWindowImpl->mpSysObj            = NULL;
-    mpWindowImpl->mpFrameWindow       = NULL;         // window to top level parent (same as frame window)
-    mpWindowImpl->mpOverlapWindow     = NULL;         // first overlap parent
-    mpWindowImpl->mpBorderWindow      = NULL;         // Border-Window
-    mpWindowImpl->mpClientWindow      = NULL;         // Client-Window of a FrameWindow
-    mpWindowImpl->mpParent            = NULL;         // parent (inkl. BorderWindow)
-    mpWindowImpl->mpRealParent        = NULL;         // real parent (exkl. BorderWindow)
-    mpWindowImpl->mpFirstChild        = NULL;         // first child window
-    mpWindowImpl->mpLastChild         = NULL;         // last child window
-    mpWindowImpl->mpFirstOverlap      = NULL;         // first overlap window (only set in overlap windows)
-    mpWindowImpl->mpLastOverlap       = NULL;         // last overlap window (only set in overlap windows)
-    mpWindowImpl->mpPrev              = NULL;         // prev window
-    mpWindowImpl->mpNext              = NULL;         // next window
-    mpWindowImpl->mpNextOverlap       = NULL;         // next overlap window of frame
-    mpWindowImpl->mpLastFocusWindow   = NULL;         // window for focus restore
-    mpWindowImpl->mpDlgCtrlDownWindow = NULL;         // window for dialog control
-    mpWindowImpl->mpFirstDel          = NULL;         // Dtor notification list
-    mpWindowImpl->mpUserData          = NULL;         // user data
-    mpWindowImpl->mpExtImpl           = NULL;         // extended implementation data
-    mpWindowImpl->mpCursor            = NULL;         // cursor
-    mpWindowImpl->mpControlFont       = NULL;         // font propertie
-    mpWindowImpl->mpVCLXWindow        = NULL;
-    mpWindowImpl->mpAccessibleInfos   = NULL;
-    mpWindowImpl->maControlForeground = Color( COL_TRANSPARENT );     // kein Foreground gesetzt
-    mpWindowImpl->maControlBackground = Color( COL_TRANSPARENT );     // kein Background gesetzt
-    mpWindowImpl->mnLeftBorder        = 0;            // left border
-    mpWindowImpl->mnTopBorder         = 0;            // top border
-    mpWindowImpl->mnRightBorder       = 0;            // right border
-    mpWindowImpl->mnBottomBorder      = 0;            // bottom border
-    mpWindowImpl->mnX                 = 0;            // X-Position to Parent
-    mpWindowImpl->mnY                 = 0;            // Y-Position to Parent
-	mpWindowImpl->mnAbsScreenX        = 0;            // absolute X-position on screen, used for RTL window positioning
-    mpWindowImpl->mpChildClipRegion   = NULL;         // Child-Clip-Region when ClipChildren
-    mpWindowImpl->mpPaintRegion       = NULL;         // Paint-ClipRegion
-    mpWindowImpl->mnStyle             = 0;            // style (init in ImplInitWindow)
-    mpWindowImpl->mnPrevStyle         = 0;            // prevstyle (set in SetStyle)
-    mpWindowImpl->mnExtendedStyle     = 0;            // extended style (init in ImplInitWindow)
-    mpWindowImpl->mnPrevExtendedStyle = 0;            // prevstyle (set in SetExtendedStyle)
-    mpWindowImpl->mnType              = nType;        // type
-    mpWindowImpl->mnGetFocusFlags     = 0;            // Flags fuer GetFocus()-Aufruf
-    mpWindowImpl->mnWaitCount         = 0;            // Wait-Count (>1 == Warte-MousePointer)
-    mpWindowImpl->mnPaintFlags        = 0;            // Flags for ImplCallPaint
-    mpWindowImpl->mnParentClipMode    = 0;            // Flags for Parent-ClipChildren-Mode
-    mpWindowImpl->mnActivateMode      = 0;            // Wird bei System/Overlap-Windows umgesetzt
-    mpWindowImpl->mnDlgCtrlFlags      = 0;            // DialogControl-Flags
-    mpWindowImpl->mnLockCount         = 0;            // LockCount
-    mpWindowImpl->meAlwaysInputMode   = AlwaysInputNone; // neither AlwaysEnableInput nor AlwaysDisableInput called
-    mpWindowImpl->mbFrame             = sal_False;        // sal_True: Window is a frame window
-    mpWindowImpl->mbBorderWin         = sal_False;        // sal_True: Window is a border window
-    mpWindowImpl->mbOverlapWin        = sal_False;        // sal_True: Window is a overlap window
-    mpWindowImpl->mbSysWin            = sal_False;        // sal_True: SystemWindow is the base class
-    mpWindowImpl->mbDialog            = sal_False;        // sal_True: Dialog is the base class
-    mpWindowImpl->mbDockWin           = sal_False;        // sal_True: DockingWindow is the base class
-    mpWindowImpl->mbFloatWin          = sal_False;        // sal_True: FloatingWindow is the base class
-    mpWindowImpl->mbPushButton        = sal_False;        // sal_True: PushButton is the base class
-    mpWindowImpl->mbToolBox			= sal_False;		// sal_True: ToolBox is the base class
-    mpWindowImpl->mbMenuFloatingWindow= sal_False;		// sal_True: MenuFloatingWindow is the base class
-    mpWindowImpl->mbToolbarFloatingWindow= sal_False;		// sal_True: ImplPopupFloatWin is the base class, used for subtoolbars
-    mpWindowImpl->mbSplitter			= sal_False;		// sal_True: Splitter is the base class
-    mpWindowImpl->mbVisible           = sal_False;        // sal_True: Show( sal_True ) called
-    mpWindowImpl->mbOverlapVisible    = sal_False;        // sal_True: Hide called for visible window from ImplHideAllOverlapWindow()
-    mpWindowImpl->mbDisabled          = sal_False;        // sal_True: Enable( sal_False ) called
-    mpWindowImpl->mbInputDisabled     = sal_False;        // sal_True: EnableInput( sal_False ) called
-    mpWindowImpl->mbDropDisabled      = sal_False;        // sal_True: Drop is enabled
-    mpWindowImpl->mbNoUpdate          = sal_False;        // sal_True: SetUpdateMode( sal_False ) called
-    mpWindowImpl->mbNoParentUpdate    = sal_False;        // sal_True: SetParentUpdateMode( sal_False ) called
-    mpWindowImpl->mbActive            = sal_False;        // sal_True: Window Active
-    mpWindowImpl->mbParentActive      = sal_False;        // sal_True: OverlapActive from Parent
-    mpWindowImpl->mbReallyVisible     = sal_False;        // sal_True: this and all parents to an overlaped window are visible
-    mpWindowImpl->mbReallyShown       = sal_False;        // sal_True: this and all parents to an overlaped window are shown
-    mpWindowImpl->mbInInitShow        = sal_False;        // sal_True: we are in InitShow
-    mpWindowImpl->mbChildNotify       = sal_False;        // sal_True: ChildNotify
-    mpWindowImpl->mbChildPtrOverwrite = sal_False;        // sal_True: PointerStyle overwrites Child-Pointer
-    mpWindowImpl->mbNoPtrVisible      = sal_False;        // sal_True: ShowPointer( sal_False ) called
-    mpWindowImpl->mbMouseMove         = sal_False;        // sal_True: BaseMouseMove called
-    mpWindowImpl->mbPaintFrame        = sal_False;        // sal_True: Paint is visible, but not painted
-    mpWindowImpl->mbInPaint           = sal_False;        // sal_True: Inside PaintHdl
-    mpWindowImpl->mbMouseButtonDown   = sal_False;        // sal_True: BaseMouseButtonDown called
-    mpWindowImpl->mbMouseButtonUp     = sal_False;        // sal_True: BaseMouseButtonUp called
-    mpWindowImpl->mbKeyInput          = sal_False;        // sal_True: BaseKeyInput called
-    mpWindowImpl->mbKeyUp             = sal_False;        // sal_True: BaseKeyUp called
-    mpWindowImpl->mbCommand           = sal_False;        // sal_True: BaseCommand called
-    mpWindowImpl->mbDefPos            = sal_True;         // sal_True: Position is not Set
-    mpWindowImpl->mbDefSize           = sal_True;         // sal_True: Size is not Set
-    mpWindowImpl->mbCallMove          = sal_True;         // sal_True: Move must be called by Show
-    mpWindowImpl->mbCallResize        = sal_True;         // sal_True: Resize must be called by Show
-    mpWindowImpl->mbWaitSystemResize  = sal_True;         // sal_True: Wait for System-Resize
-    mpWindowImpl->mbInitWinClipRegion = sal_True;         // sal_True: Calc Window Clip Region
-    mpWindowImpl->mbInitChildRegion   = sal_False;        // sal_True: InitChildClipRegion
-    mpWindowImpl->mbWinRegion         = sal_False;        // sal_True: Window Region
-    mpWindowImpl->mbClipChildren      = sal_False;        // sal_True: Child-Fenster muessen evt. geclippt werden
-    mpWindowImpl->mbClipSiblings      = sal_False;        // sal_True: Nebeneinanderliegende Child-Fenster muessen evt. geclippt werden
-    mpWindowImpl->mbChildTransparent  = sal_False;        // sal_True: Child-Fenster duerfen transparent einschalten (inkl. Parent-CLIPCHILDREN)
-    mpWindowImpl->mbPaintTransparent  = sal_False;        // sal_True: Paints muessen auf Parent ausgeloest werden
-    mpWindowImpl->mbMouseTransparent  = sal_False;        // sal_True: Window is transparent for Mouse
-    mpWindowImpl->mbDlgCtrlStart      = sal_False;        // sal_True: Ab hier eigenes Dialog-Control
-    mpWindowImpl->mbFocusVisible      = sal_False;        // sal_True: Focus Visible
-    mpWindowImpl->mbUseNativeFocus    = sal_False;
-    mpWindowImpl->mbNativeFocusVisible= sal_False;        // sal_True: native Focus Visible
-    mpWindowImpl->mbInShowFocus       = sal_False;        // prevent recursion
-    mpWindowImpl->mbInHideFocus       = sal_False;        // prevent recursion
-    mpWindowImpl->mbTrackVisible      = sal_False;        // sal_True: Tracking Visible
-    mpWindowImpl->mbControlForeground = sal_False;        // sal_True: Foreground-Property set
-    mpWindowImpl->mbControlBackground = sal_False;        // sal_True: Background-Property set
-    mpWindowImpl->mbAlwaysOnTop       = sal_False;        // sal_True: immer vor allen anderen normalen Fenstern sichtbar
-    mpWindowImpl->mbCompoundControl   = sal_False;        // sal_True: Zusammengesetztes Control => Listener...
-    mpWindowImpl->mbCompoundControlHasFocus = sal_False;  // sal_True: Zusammengesetztes Control hat irgendwo den Focus
-    mpWindowImpl->mbPaintDisabled     = sal_False;        // sal_True: Paint soll nicht ausgefuehrt werden
-    mpWindowImpl->mbAllResize         = sal_False;        // sal_True: Auch ResizeEvents mit 0,0 schicken
-    mpWindowImpl->mbInDtor            = sal_False;        // sal_True: Wir befinden uns im Window-Dtor
-    mpWindowImpl->mbExtTextInput      = sal_False;        // sal_True: ExtTextInput-Mode is active
-    mpWindowImpl->mbInFocusHdl        = sal_False;        // sal_True: Innerhalb vom GetFocus-Handler
-    mpWindowImpl->mbCreatedWithToolkit = sal_False;
-    mpWindowImpl->mbSuppressAccessibilityEvents = sal_False; // sal_True: do not send any accessibility events
-    mpWindowImpl->mbDrawSelectionBackground = sal_False;    // sal_True: draws transparent window background to indicate (toolbox) selection
-    mpWindowImpl->mbIsInTaskPaneList = sal_False;           // sal_True: window was added to the taskpanelist in the topmost system window
-    mpWindowImpl->mnNativeBackground  = 0;              // initialize later, depends on type
-    mpWindowImpl->mbCallHandlersDuringInputDisabled = sal_False; // sal_True: call event handlers even if input is disabled
-    mpWindowImpl->mbDisableAccessibleLabelForRelation = sal_False; // sal_True: do not set LabelFor relation on accessible objects
-    mpWindowImpl->mbDisableAccessibleLabeledByRelation = sal_False; // sal_True: do not set LabeledBy relation on accessible objects
-    mpWindowImpl->mbHelpTextDynamic = sal_False;          // sal_True: append help id in HELP_DEBUG case
-    mpWindowImpl->mbFakeFocusSet = sal_False; // sal_True: pretend as if the window has focus.
-
     mbEnableRTL         = Application::GetSettings().GetLayoutRTL();         // sal_True: this outdev will be mirrored if RTL window layout (UI mirroring) is globally active
 }
 
@@ -4700,11 +4702,10 @@ Window::~Window()
             Application::RemoveUserEvent( mpWindowImpl->mpFrameData->mnMouseMoveId );
     }
 
-    // Graphic freigeben
+    // release SalGraphics
     ImplReleaseGraphics();
 
-    // Evt. anderen Funktion mitteilen, das das Fenster geloescht
-    // wurde
+    // notify ImplDelData subscribers of this window about the window deletion
     ImplDelData* pDelData = mpWindowImpl->mpFirstDel;
     while ( pDelData )
     {
@@ -4713,7 +4714,7 @@ Window::~Window()
         pDelData = pDelData->mpNext;
     }
 
-    // Fenster aus den Listen austragen
+    // remove window from the lists
     ImplRemoveWindow( sal_True );
 
     // de-register as "top window child" at our parent, if necessary
@@ -4732,7 +4733,7 @@ Window::~Window()
         }
     }
 
-    // Extra Window Daten loeschen
+    // cleanup Extra Window Data, TODO: add and use ImplWinData destructor
     if ( mpWindowImpl->mpWinData )
     {
         if ( mpWindowImpl->mpWinData->mpExtOldText )
@@ -4749,14 +4750,11 @@ Window::~Window()
         delete mpWindowImpl->mpWinData;
     }
 
-
-    // Overlap-Window-Daten loeschen
+    // cleanup overlap related window data
     if ( mpWindowImpl->mpOverlapData )
-    {
         delete mpWindowImpl->mpOverlapData;
-    }
 
-    // Evt. noch BorderWindow oder Frame zerstoeren
+    // remove BorderWindow or Frame window data
     if ( mpWindowImpl->mpBorderWindow )
         delete mpWindowImpl->mpBorderWindow;
     else if ( mpWindowImpl->mbFrame )
@@ -4775,12 +4773,6 @@ Window::~Window()
         delete mpWindowImpl->mpFrameData;
     }
 
-    if ( mpWindowImpl->mpChildClipRegion )
-        delete mpWindowImpl->mpChildClipRegion;
-
-    delete mpWindowImpl->mpAccessibleInfos;
-    delete mpWindowImpl->mpControlFont;
-
     // should be the last statements
     delete mpWindowImpl; mpWindowImpl = NULL;
 }

Modified: incubator/ooo/branches/alg/aw080/main/vcl/unx/generic/fontmanager/helper.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/unx/generic/fontmanager/helper.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/unx/generic/fontmanager/helper.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/unx/generic/fontmanager/helper.cxx Wed Jun 27 13:44:09 2012
@@ -250,7 +250,7 @@ OUString psp::getFontPath()
 
 bool psp::convertPfbToPfa( ::osl::File& rInFile, ::osl::File& rOutFile )
 {
-    static unsigned char hexDigits[] =
+    static const unsigned char hexDigits[] =
         {
             '0', '1', '2', '3', '4', '5', '6', '7',
             '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
@@ -266,10 +266,12 @@ bool psp::convertPfbToPfa( ::osl::File& 
     while( bSuccess && ! bEof )
     {
         // read leading bytes
-        bEof = ! rInFile.read( buffer, 6, nRead ) && nRead == 6 ? false : true;
+        bEof = ((0 != rInFile.read( buffer, 6, nRead)) || (nRead != 6));
+        if( bEof )
+            break;
         unsigned int nType = buffer[ 1 ];
         unsigned int nBytesToRead = buffer[2] | buffer[3] << 8 | buffer[4] << 16 | buffer[5] << 24;
-        if( buffer[0] != 0x80 ) // test for pfb m_agic number
+        if( buffer[0] != 0x80 ) // test for pfb magic number
         {
             // this migt be a pfa font already
             sal_uInt64 nWrite = 0;

Modified: incubator/ooo/branches/alg/aw080/main/vcl/unx/generic/printer/cupsmgr.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/unx/generic/printer/cupsmgr.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/unx/generic/printer/cupsmgr.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/unx/generic/printer/cupsmgr.cxx Wed Jun 27 13:44:09 2012
@@ -240,7 +240,6 @@ struct GetPPDAttribs
     osl::Condition		m_aCondition;
     OString			    m_aParameter;
     OString			    m_aResult;
-    oslThread			m_aThread;
     int                 m_nRefs;
     bool*               m_pResetRunning;
     osl::Mutex*         m_pSyncMutex;

Modified: incubator/ooo/branches/alg/aw080/main/vcl/win/source/gdi/salgdi3.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/win/source/gdi/salgdi3.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/win/source/gdi/salgdi3.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/win/source/gdi/salgdi3.cxx Wed Jun 27 13:44:09 2012
@@ -605,16 +605,20 @@ bool WinGlyphFallbackSubstititution::Fin
 	if( nTestFontCount > MAX_GFBFONT_COUNT )
 		nTestFontCount = MAX_GFBFONT_COUNT;
 	
+	bool bFound = false;
 	for( int i = 0; i < nTestFontCount; ++i )
 	{
 		const ImplFontData* pFace = pTestFontList->Get( i );
-		if( !HasMissingChars( pFace, rMissingChars ) )
+		bFound = HasMissingChars( pFace, rMissingChars );
+		if( !bFound )
 			continue;
 		rFontSelData.maSearchName = pFace->maName;
-		return true;
+		break;
 	}
 
-	return false;
+	delete pTestFontList;
+
+	return bFound;
 }
 
 // =======================================================================

Modified: incubator/ooo/branches/alg/aw080/main/writerfilter/source/dmapper/DomainMapper.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/writerfilter/source/dmapper/DomainMapper.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/writerfilter/source/dmapper/DomainMapper.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/writerfilter/source/dmapper/DomainMapper.cxx Wed Jun 27 13:44:09 2012
@@ -2647,13 +2647,18 @@ void DomainMapper::sprmWithProps( Sprm& 
     case NS_sprm::LN_POutLvl:
         /* WRITERFILTERSTATUS: done: 0, planned: 2, spent: 0 */
         { 
+            sal_Int16 nLvl = static_cast< sal_Int16 >( nIntValue );
             if( m_pImpl->IsStyleSheetImport() )
             {
-                sal_Int16 nLvl = static_cast< sal_Int16 >( nIntValue );
 
                 StyleSheetPropertyMap* pStyleSheetPropertyMap = dynamic_cast< StyleSheetPropertyMap* >( rContext.get() );
                 pStyleSheetPropertyMap->SetOutlineLevel( nLvl );
             }
+            else
+            {
+                nLvl = nLvl >= WW_OUTLINE_MIN && nLvl < WW_OUTLINE_MAX? nLvl+1 : 0; //0 means no outline level set on
+                rContext->Insert(PROP_OUTLINE_LEVEL, true, uno::makeAny ( nLvl ));
+            }
         }
         break;  // sprmPOutLvl
     case NS_sprm::LN_PFBiDi:

Modified: incubator/ooo/branches/alg/aw080/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx Wed Jun 27 13:44:09 2012
@@ -2014,7 +2014,7 @@ bool lcl_FindInCommand(
 //                    {
                             //todo: entries can only be included completely
 //                    }
-//                  \n Builds a table of contents or a range of entries, sucah as “1-9”, in a table of contents without page numbers
+//                  \n Builds a table of contents or a range of entries, sucah as ?-9? in a table of contents without page numbers
 //                    if( lcl_FindInCommand( rCommand, 'n', sValue ))
 //                    {
                         //todo: what does the description mean?
@@ -2721,7 +2721,7 @@ void DomainMapper_Impl::handleToc
 //                    {
                             //todo: entries can only be included completely
 //                    }
-//                  \n Builds a table of contents or a range of entries, sucah as “1-9”, in a table of contents without page numbers
+//                  \n Builds a table of contents or a range of entries, sucah as ?-9? in a table of contents without page numbers
 //                    if( lcl_FindInCommand( pContext->GetCommand(), 'n', sValue ))
 //                    {
                         //todo: what does the description mean?
@@ -2731,9 +2731,14 @@ void DomainMapper_Impl::handleToc
     {
         bFromOutline = true;
         UniString sParam( sValue );
-        xub_StrLen nIndex = 0;
-        sParam.GetToken( 0, '-', nIndex );
-        nMaxLevel = sal_Int16( sParam.Copy( nIndex ).ToInt32( ) );
+        if (!sParam.Len())
+            nMaxLevel = WW_OUTLINE_MAX;
+        else
+        {
+            xub_StrLen nIndex = 0;
+            sParam.GetToken( 0, '-', nIndex );
+            nMaxLevel = sal_Int16( sParam.Copy( nIndex ).ToInt32( ) );
+        }
     }
 //                  \p Defines the separator between the table entry and its page number
     if( lcl_FindInCommand( pContext->GetCommand(), 'p', sValue ))
@@ -3179,7 +3184,33 @@ void DomainMapper_Impl::CloseFieldComman
                     break;
                     case FIELD_SECTION      : break;
                     case FIELD_SECTIONPAGES : break;
-                    case FIELD_SEQ          : break;
+                    case FIELD_SEQ          : 
+					{
+                        // command looks like: " SEQ Table \* ARABIC "
+                        ::rtl::OUString sCmd(pContext->GetCommand());
+                        // find the sequence name, e.g. "SEQ"
+                        ::rtl::OUString sSeqName = lcl_FindQuotedText(sCmd, "SEQ ", '\\');
+                        sSeqName = sSeqName.trim();
+
+                        // create a sequence field master using the sequence name
+                        uno::Reference< beans::XPropertySet > xMaster = FindOrCreateFieldMaster(
+                                    "com.sun.star.text.FieldMaster.SetExpression",
+                                    sSeqName);
+
+                        xMaster->setPropertyValue( 
+                            rPropNameSupplier.GetName(PROP_SUB_TYPE),
+                            uno::makeAny(text::SetVariableType::SEQUENCE));
+
+                        // apply the numbering type
+                        xFieldProperties->setPropertyValue(
+                            rPropNameSupplier.GetName(PROP_NUMBERING_TYPE),
+                            uno::makeAny( lcl_ParseNumberingType(pContext->GetCommand()) ));
+                        
+                        // attach the master to the field
+                        uno::Reference< text::XDependentTextField > xDependentField( xFieldInterface, uno::UNO_QUERY_THROW );
+                        xDependentField->attachTextFieldMaster( xMaster );
+                    }
+                    break;
                     case FIELD_SET          : break;
                     case FIELD_SKIPIF       : break;
                     case FIELD_STYLEREF     : break;

Modified: incubator/ooo/branches/alg/aw080/main/writerfilter/source/dmapper/PropertyMap.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/writerfilter/source/dmapper/PropertyMap.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/writerfilter/source/dmapper/PropertyMap.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/writerfilter/source/dmapper/PropertyMap.hxx Wed Jun 27 13:44:09 2012
@@ -384,6 +384,7 @@ typedef boost::shared_ptr<ParagraphPrope
   -----------------------------------------------------------------------*/
 
 #define WW_OUTLINE_MAX  sal_Int16( 9 )
+#define WW_OUTLINE_MIN  sal_Int16( 0 )
 
 class StyleSheetPropertyMap : public PropertyMap, public ParagraphProperties
 

Modified: incubator/ooo/branches/alg/aw080/main/writerfilter/source/dmapper/StyleSheetTable.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/writerfilter/source/dmapper/StyleSheetTable.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/writerfilter/source/dmapper/StyleSheetTable.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/writerfilter/source/dmapper/StyleSheetTable.cxx Wed Jun 27 13:44:09 2012
@@ -37,6 +37,7 @@
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/style/XStyle.hpp>
+#include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/text/WritingMode.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <map>
@@ -88,6 +89,8 @@ TableStyleSheetEntry::TableStyleSheetEnt
     sNextStyleIdentifier = rEntry.sNextStyleIdentifier;
     sStyleName = rEntry.sStyleName;
     sStyleName1 = rEntry.sStyleName1;
+	sStyleIdentifierI = rEntry.sStyleIdentifierI;
+	sStyleIdentifierD = rEntry.sStyleIdentifierD;
 
     m_nColBandSize = 1;
     m_nRowBandSize = 1;
@@ -891,7 +894,23 @@ void StyleSheetTable::ApplyStyleSheets( 
                             xState->setPropertyToDefault(rPropNameSupplier.GetName( PROP_CHAR_PROP_HEIGHT_ASIAN  ));
                             xState->setPropertyToDefault(rPropNameSupplier.GetName( PROP_CHAR_PROP_HEIGHT_COMPLEX));
 
-                        }
+                        } else if(sConvertedStyleName.equalsAscii( "Title" ) ||
+								sConvertedStyleName.equalsAscii( "Subtitle" ))	{
+							//set the default adjust for ParaStyle Title and Subtitle to left
+							try
+							{
+								uno::Reference< beans::XPropertySet > xProp( xStyle, uno::UNO_QUERY );
+								if( xProp.is() )
+								{
+									uno::Any aMSDefaultVal = uno::makeAny( (sal_Int16)style::ParagraphAdjust_LEFT );
+									xProp->setPropertyValue( rPropNameSupplier.GetName( PROP_PARA_ADJUST), aMSDefaultVal );
+								}
+							}
+							catch(...)
+							{
+								OSL_ENSURE( false, "Default ParaAdjust style property could not be set");
+							}
+						}
                     }
 
                     if(bAddFollowStyle || aPropValues.getLength())

Modified: incubator/ooo/branches/alg/aw080/main/writerfilter/source/doctok/WW8Sttbf.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/writerfilter/source/doctok/WW8Sttbf.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/writerfilter/source/doctok/WW8Sttbf.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/writerfilter/source/doctok/WW8Sttbf.cxx Wed Jun 27 13:44:09 2012
@@ -141,12 +141,11 @@ WW8SttbRgtplc::getEntry(sal_uInt32 nInde
     
     sal_uInt32 nOffset = 6;
     
-    while (nIndex > 0)
+    for(; nIndex > 0; --nIndex)
     {
         sal_uInt16 nCount = getU16(nOffset);
         
         nOffset = nOffset + 2 + nCount;
-        ++nIndex;
     }
     
     sal_uInt16 nCount = getU16(nOffset);

Modified: incubator/ooo/branches/alg/aw080/main/xml2cmp/source/support/list.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/xml2cmp/source/support/list.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/xml2cmp/source/support/list.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/xml2cmp/source/support/list.hxx Wed Jun 27 13:44:09 2012
@@ -224,7 +224,7 @@ DynamicList<XY>::insert(unsigned pos, XY
     if ( pos > this->len )
       return;
 
-    checkSize(this->len+2);
+    this->checkSize(this->len+2);
     memmove(this->inhalt[pos+1], this->inhalt[pos], (this->len-pos) * sizeof(XY*) );
     this->inhalt[pos] = elem_;
     this->len++;

Modified: incubator/ooo/branches/alg/aw080/main/xmlhelp/util/main_transform.xsl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/xmlhelp/util/main_transform.xsl?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/xmlhelp/util/main_transform.xsl (original)
+++ incubator/ooo/branches/alg/aw080/main/xmlhelp/util/main_transform.xsl Wed Jun 27 13:44:09 2012
@@ -441,16 +441,10 @@
 
 <!-- SORT -->
 <xsl:template match="sort" >
-  <!-- sorting disabled due to #i70462#
 	<xsl:apply-templates><xsl:sort select="descendant::paragraph"/></xsl:apply-templates>
-	//-->
-	<xsl:apply-templates />
 </xsl:template>
 <xsl:template match="sort" mode="embedded">
-<!-- sorting disabled due to #i70462#
 	<xsl:apply-templates><xsl:sort select="descendant::paragraph"/></xsl:apply-templates>
-	//-->
-	<xsl:apply-templates />
 </xsl:template>
 
 <!-- SWITCH -->

Modified: incubator/ooo/branches/alg/aw080/main/xmloff/inc/xmloff/xmltoken.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/xmloff/inc/xmloff/xmltoken.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/xmloff/inc/xmloff/xmltoken.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/xmloff/inc/xmloff/xmltoken.hxx Wed Jun 27 13:44:09 2012
@@ -3130,6 +3130,12 @@ namespace xmloff { namespace token {
 
         XML_MARGIN, // #i117001#
 
+        // regina, ODF1.2 additional symbols in charts
+        XML_STAR,
+        XML_ASTERISK,
+        XML_HORIZONTAL_BAR,
+        XML_VERTICAL_BAR,
+
         XML_TOKEN_END
     };
 

Modified: incubator/ooo/branches/alg/aw080/main/xmloff/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/xmloff/prj/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/xmloff/prj/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/xmloff/prj/makefile.mk Wed Jun 27 13:44:09 2012
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
 VERBOSEFLAG := -s
 .ENDIF
 
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
 all:
-	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog

Modified: incubator/ooo/branches/alg/aw080/main/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx Wed Jun 27 13:44:09 2012
@@ -58,6 +58,13 @@ SvXMLSignedEnumMapEntry aXMLChartSymbolN
     { XML_ARROW_LEFT,           5 },
     { XML_BOW_TIE,              6 },
     { XML_HOURGLASS,            7 },
+    { XML_CIRCLE,               8 },
+    { XML_STAR,                 9 },
+    { XML_X,                   10 },
+    { XML_PLUS,                11 },
+    { XML_ASTERISK,            12 },
+    { XML_HORIZONTAL_BAR,      13 },
+    { XML_VERTICAL_BAR,        14 },
     { XML_TOKEN_INVALID,        0 }
 };
 

Modified: incubator/ooo/branches/alg/aw080/main/xmloff/source/core/xmltoken.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/xmloff/source/core/xmltoken.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/xmloff/source/core/xmltoken.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/xmloff/source/core/xmltoken.cxx Wed Jun 27 13:44:09 2012
@@ -3130,6 +3130,12 @@ namespace xmloff { namespace token {
 
         TOKEN( "margin", XML_MARGIN),
 
+        // regina, ODF1.2 additional symbols in charts
+        TOKEN( "star",                         XML_STAR ),
+        TOKEN( "asterisk",                     XML_ASTERISK ),
+        TOKEN( "horizontal-bar",               XML_HORIZONTAL_BAR ),
+        TOKEN( "vertical-bar",                 XML_VERTICAL_BAR ),
+
 #if OSL_DEBUG_LEVEL > 0
         { 0, NULL, NULL,                       XML_TOKEN_END }
 #else

Modified: incubator/ooo/branches/alg/aw080/main/xmloff/source/style/xmlnumi.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/xmloff/source/style/xmlnumi.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/xmloff/source/style/xmlnumi.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/xmloff/source/style/xmlnumi.cxx Wed Jun 27 13:44:09 2012
@@ -465,7 +465,7 @@ SvXMLImportContext *SvxXMLListLevelStyle
 Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
 		const SvI18NMap *pI18NMap )
 {
-	sal_Int16 eType;
+	sal_Int16 eType = NumberingType::NUMBER_NONE;
 
     sal_Int32 nCount = 0;
 	if( bBullet )

Modified: incubator/ooo/branches/alg/aw080/main/xmloff/source/transform/StyleOASISTContext.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/xmloff/source/transform/StyleOASISTContext.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/xmloff/source/transform/StyleOASISTContext.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/xmloff/source/transform/StyleOASISTContext.cxx Wed Jun 27 13:44:09 2012
@@ -382,6 +382,20 @@ void XMLPropertiesTContext_Impl::StartEl
                             nSymbolType = 6;
                         else if( IsXMLToken( rAttrValue, XML_HOURGLASS ))
                             nSymbolType = 7;
+                        else if( IsXMLToken( rAttrValue, XML_CIRCLE ))
+                            nSymbolType = 8;
+                        else if( IsXMLToken( rAttrValue, XML_STAR ))
+                            nSymbolType = 9;
+                        else if( IsXMLToken( rAttrValue, XML_X ))
+                            nSymbolType = 10;
+                        else if( IsXMLToken( rAttrValue, XML_PLUS ))
+                            nSymbolType = 11;
+                        else if( IsXMLToken( rAttrValue, XML_ASTERISK ))
+                            nSymbolType = 12;
+                        else if( IsXMLToken( rAttrValue, XML_HORIZONTAL_BAR ))
+                            nSymbolType = 13;
+                        else if( IsXMLToken( rAttrValue, XML_VERTICAL_BAR ))
+                            nSymbolType = 14;
 
                         if( nSymbolType >= 0 )
                             pAttrList->AddAttribute(

Modified: incubator/ooo/branches/alg/aw080/main/xmloff/source/transform/StyleOOoTContext.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/xmloff/source/transform/StyleOOoTContext.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/xmloff/source/transform/StyleOOoTContext.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/xmloff/source/transform/StyleOOoTContext.cxx Wed Jun 27 13:44:09 2012
@@ -763,6 +763,27 @@ void XMLPropertiesOOoTContext_Impl::Star
                         case 7:
                             eToken = XML_HOURGLASS;
                             break;
+                        case 8:
+                            eToken = XML_CIRCLE;
+                            break;
+                        case 9:
+                            eToken = XML_STAR;
+                            break;
+                        case 10:
+                            eToken = XML_X;
+                            break;
+                        case 11:
+                            eToken = XML_PLUS;
+                            break;
+                        case 12:
+                            eToken = XML_ASTERISK;
+                            break;
+                        case 13:
+                            eToken = XML_HORIZONTAL_BAR;
+                            break;
+                        case 14:
+                            eToken = XML_VERTICAL_BAR;
+                            break;
                         default:
                             OSL_ENSURE( false, "invalid named symbol" );
                             break;



Mime
View raw message