Resync to trunk, windows non-pro build aoo/aw080

19 files changed, 48 insertions, 26 deletions

diff --git a/svtools/inc/svtools/acceleratorexecute.hxx b/svtools/inc/svtools/acceleratorexecute.hxx
index 3f180ef7481a..68e38dce0458 100644
--- a/svtools/inc/svtools/acceleratorexecute.hxx
+++ b/svtools/inc/svtools/acceleratorexecute.hxx
@@ -99,7 +99,7 @@ struct TMutexInit
             Because exceution of an accelerator command can be dangerous
             (in case it force an office shutdown for key "ALT+F4"!)
             all internal dispatches are done asynchronous.
-            Menas that the trigger call doesnt wait till the dispatch
+            Menas that the trigger call doesn't wait till the dispatch
             is finished. You can call very often. All requests will be
             queued internal and dispatched ASAP.
 
@@ -171,7 +171,7 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit
                       => All currently queued events will be finished. The
                          helper kills itself afterwards. A shutdown of the
                          environment will be recognized ... The helper stop its
-                         work immediatly then!
+                         work immediately then!
          */
         static AcceleratorExecute* createAcceleratorHelper();
 
diff --git a/svtools/inc/svtools/accessibletable.hxx b/svtools/inc/svtools/accessibletable.hxx
index 4bd30a25a176..0b92a956e756 100644
--- a/svtools/inc/svtools/accessibletable.hxx
+++ b/svtools/inc/svtools/accessibletable.hxx
@@ -83,7 +83,7 @@ public:
         @param  eObjType
             The type to ask for
         @param  _nPosition
-            The position of a tablecell (index position), header bar  colum/row cell
+            The position of a tablecell (index position), header bar  column/row cell
         @return
             The description of the specified object.
     */
diff --git a/svtools/inc/svtools/brwbox.hxx b/svtools/inc/svtools/brwbox.hxx
index c36a0fe55a21..2c4415e45072 100644
--- a/svtools/inc/svtools/brwbox.hxx
+++ b/svtools/inc/svtools/brwbox.hxx
@@ -591,7 +591,7 @@ public:
     void            RowModified( long nRow, sal_uInt16 nColId = USHRT_MAX );
     void            RowInserted( long nRow, long nNumRows = 1, sal_Bool bDoPaint = sal_True, sal_Bool bKeepSelection = sal_False );
 
-    // miscellanous
+    // miscellaneous
     void            ReserveControlArea( sal_uInt16 nWidth = USHRT_MAX );
     Rectangle       GetControlArea() const;
     sal_Bool            ProcessKey( const KeyEvent& rEvt );
@@ -702,7 +702,7 @@ public:
         @param  _nRowId
             the current row
         @param  _nColId
-            teh column id
+            the column id
         @param  _bOnScreen
             <TRUE/> when the rectangle should be calculated OnScreen
         @return
@@ -790,7 +790,7 @@ public:
         @param  eObjType
             The type to ask for
         @param  _nPosition
-            The position of a tablecell (index position), header bar  colum/row cell
+            The position of a tablecell (index position), header bar  column/row cell
         @return
             The name of the specified object.
     */
@@ -800,7 +800,7 @@ public:
         @param  eObjType
             The type to ask for
         @param  _nPosition
-            The position of a tablecell (index position), header bar  colum/row cell
+            The position of a tablecell (index position), header bar  column/row cell
         @return
             The description of the specified object.
     */
diff --git a/svtools/inc/svtools/contextmenuhelper.hxx b/svtools/inc/svtools/contextmenuhelper.hxx
index 1611e71744ae..37e56a809693 100644
--- a/svtools/inc/svtools/contextmenuhelper.hxx
+++ b/svtools/inc/svtools/contextmenuhelper.hxx
@@ -100,7 +100,7 @@ class SVT_DLLPUBLIC ContextMenuHelper
         bool            associateUIConfigurationManagers();
 
         // resets associations to create associations again on-demand.
-        // Usefull for implementations which recycle frames. Normal
+        // Useful for implementations which recycle frames. Normal
         // implementations can profit from caching and should set
         // auto refresh on ctor to false (default).
         void            resetAssociations()
diff --git a/svtools/inc/svtools/dialogcontrolling.hxx b/svtools/inc/svtools/dialogcontrolling.hxx
index f4a54a711ccf..694de04016dc 100644
--- a/svtools/inc/svtools/dialogcontrolling.hxx
+++ b/svtools/inc/svtools/dialogcontrolling.hxx
@@ -110,7 +110,7 @@ namespace svt
         */
         void    addDependentWindow( Window& _rWindow );
 
-        /** resets the controller so that no actions happend anymore.
+        /** resets the controller so that no actions happened anymore.
 
             The instances is disfunctional after this method has been called.
         */
diff --git a/svtools/inc/svtools/fmtfield.hxx b/svtools/inc/svtools/fmtfield.hxx
index 4db1a3b3515f..9ef8a37df9d3 100644
--- a/svtools/inc/svtools/fmtfield.hxx
+++ b/svtools/inc/svtools/fmtfield.hxx
@@ -42,7 +42,7 @@
 
 typedef sal_uInt16 FORMAT_CHANGE_TYPE;
 #define FCT_KEYONLY         0x00        // only a new key was set
-#define FCT_FORMATTER       0x01        // a new formatter weas set, usually implies a change of the key, too
+#define FCT_FORMATTER       0x01        // a new formatter was set, usually implies a change of the key, too
 #define FCT_PRECISION       0x02        // a new precision was set
 #define FCT_THOUSANDSSEP    0x03        // the thousands separator setting changed
 
diff --git a/svtools/inc/svtools/genericunodialog.hxx b/svtools/inc/svtools/genericunodialog.hxx
index 339f6e9a7dcb..ce86d5b3fb47 100644
--- a/svtools/inc/svtools/genericunodialog.hxx
+++ b/svtools/inc/svtools/genericunodialog.hxx
@@ -75,7 +75,7 @@ namespace svt
             ,public ::comphelper::OPropertyContainer
     {
     private:
-        ::osl::Mutex                    m_aExecutionMutex;  /// acess safety for execute/cancel
+        ::osl::Mutex                    m_aExecutionMutex;  /// access safety for execute/cancel
 
     protected:
         Dialog*                     m_pDialog;                  /// the dialog to execute
diff --git a/svtools/inc/svtools/grfmgr.hxx b/svtools/inc/svtools/grfmgr.hxx
index 94b8b10cb0e8..52902c0722b6 100644
--- a/svtools/inc/svtools/grfmgr.hxx
+++ b/svtools/inc/svtools/grfmgr.hxx
@@ -207,7 +207,10 @@ private:
     Timer*                  mpSwapOutTimer;
     GrfSimpleCacheObj*      mpSimpleCache;
     sal_uLong                   mnAnimationLoopCount;
-    void*                   mpDummy1;
+
+    // a unique increasing ID to be able to say which data change is older
+    sal_uLong               mnDataChangeTimeStamp;
+
     void*                   mpDummy2;
     sal_Bool                mbAutoSwapped   : 1;
     sal_Bool                mbTransparent   : 1;
@@ -299,6 +302,10 @@ private:
 
                             DECL_LINK( ImplAutoSwapOutHdl, void* );
 
+    // Handle evtl. needed AfterDataChanges, needs to be called when new
+    // graphic data is swapped in/added to the GraphicManager
+    void ImplAfterDataChange();
+
 protected:
 
     virtual void            GraphicManagerDestroyed();
@@ -479,6 +486,12 @@ public:
         double fTopCrop,
         double fRightCrop,
         double fBottomCrop) const;
+
+    // read access
+    sal_uLong GetDataChangeTimeStamp() const { return mnDataChangeTimeStamp; }
+
+    // restart SwapOut timer; this is like touching in a cache to reset to the full timeout value
+    void restartSwapOutTimer() const;
 };
 
 // ------------------
@@ -543,6 +556,15 @@ private:
 
     ByteString      SVT_DLLPRIVATE ImplGetUniqueID( const GraphicObject& rObj ) const;
 
+    // This method allows to check memory footprint for all currently swapped in GraphicObjects on this GraphicManager
+    // which are based on Bitmaps. This is needed on 32Bit systems and only does something on those systems. The problem
+    // to solve is that normally the SwapOut is timer-driven, but even with short timer settings there are situations
+    // where this does not trigger - or in other words: A maximum limitation for GraphicManagers was not in place before.
+    // For 32Bit systems this leads to situations where graphics will be missing. This method will actively swap out
+    // the longest swapped in graphics until a maximum memory boundary (derived from user settings in tools/options/memory)
+    // is no longer exceeded
+    void ImplCheckSizeOfSwappedInGraphics();
+
 public:
 
                     GraphicManager( sal_uLong nCacheSize = 10000000UL, sal_uLong nMaxObjCacheSize = 2400000UL );
diff --git a/svtools/inc/svtools/helpagentwindow.hxx b/svtools/inc/svtools/helpagentwindow.hxx
index 8f3f1ed12867..b09280c3e407 100644
--- a/svtools/inc/svtools/helpagentwindow.hxx
+++ b/svtools/inc/svtools/helpagentwindow.hxx
@@ -61,7 +61,7 @@ namespace svt
         /// returns the preferred size of the window
         const Size& getPreferredSizePixel() const { return m_aPreferredSize; }
 
-        // callback handler maintainance
+        // callback handler maintenance
         void                setCallback(IHelpAgentCallback* _pCB) { m_pCallback = _pCB; }
         IHelpAgentCallback* getCallback() const { return m_pCallback; }
 
diff --git a/svtools/inc/svtools/menuoptions.hxx b/svtools/inc/svtools/menuoptions.hxx
index 5b52df8a7e53..9a2a3dfce44c 100644
--- a/svtools/inc/svtools/menuoptions.hxx
+++ b/svtools/inc/svtools/menuoptions.hxx
@@ -39,7 +39,7 @@
 /*-************************************************************************************************************//**
     @short          forward declaration to our private date container implementation
     @descr          We use these class as internal member to support small memory requirements.
-                    You can create the container if it is neccessary. The class which use these mechanism
+                    You can create the container if it is necessary. The class which use these mechanism
                     is faster and smaller then a complete implementation!
 *//*-*************************************************************************************************************/
 
diff --git a/svtools/inc/svtools/miscopt.hxx b/svtools/inc/svtools/miscopt.hxx
index 605f0280c64b..63e43caada06 100644
--- a/svtools/inc/svtools/miscopt.hxx
+++ b/svtools/inc/svtools/miscopt.hxx
@@ -41,7 +41,7 @@
 /*-************************************************************************************************************//**
     @short          forward declaration to our private date container implementation
     @descr          We use these class as internal member to support small memory requirements.
-                    You can create the container if it is neccessary. The class which use these mechanism
+                    You can create the container if it is necessary. The class which use these mechanism
                     is faster and smaller then a complete implementation!
 *//*-*************************************************************************************************************/
 
diff --git a/svtools/inc/svtools/optionsdrawinglayer.hxx b/svtools/inc/svtools/optionsdrawinglayer.hxx
index 439728e7ddf4..4ac490d3aaf5 100644
--- a/svtools/inc/svtools/optionsdrawinglayer.hxx
+++ b/svtools/inc/svtools/optionsdrawinglayer.hxx
@@ -41,7 +41,7 @@
 /*-************************************************************************************************************//**
     @short          forward declaration to our private date container implementation
     @descr          We use these class as internal member to support small memory requirements.
-                    You can create the container if it is neccessary. The class which use these mechanism
+                    You can create the container if it is necessary. The class which use these mechanism
                     is faster and smaller then a complete implementation!
 *//*-*************************************************************************************************************/
 
diff --git a/svtools/inc/svtools/stringtransfer.hxx b/svtools/inc/svtools/stringtransfer.hxx
index 281f40b54fe0..905ddaff1d78 100644
--- a/svtools/inc/svtools/stringtransfer.hxx
+++ b/svtools/inc/svtools/stringtransfer.hxx
@@ -62,7 +62,7 @@ namespace svt
         SVT_DLLPUBLIC static void           CopyString( const ::rtl::OUString& _rContent, Window* _pWindow = NULL );
 
         /** extracts a string from the system clipboard given
-            @return <TRUE/> if the extraction was successfull, i.e. if the clipboard contained a string content
+            @return <TRUE/> if the extraction was successful, i.e. if the clipboard contained a string content
         */
         SVT_DLLPUBLIC static sal_Bool       PasteString( ::rtl::OUString& _rContent, Window* _pWindow = NULL );
 
diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx
index 1948efe28220..4744242d902f 100644
--- a/svtools/inc/svtools/svlbitm.hxx
+++ b/svtools/inc/svtools/svlbitm.hxx
@@ -95,7 +95,7 @@ public:
     Image aBmps[24];  // Indizes siehe Konstanten BMP_ ....
 
     void                    SetDefaultImages( const Control* pControlForSettings = NULL );
-                                // set images acording to the color scheeme of the Control
+                                // set images according to the color scheeme of the Control
                                 // pControlForSettings == NULL: settings are taken from Application
     sal_Bool                    HasDefaultImages( void ) const;
 };
diff --git a/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtdata.hxx
index 6eb8d71ab1ac..00c40bdbd83c 100644
--- a/svtools/inc/svtools/svtdata.hxx
+++ b/svtools/inc/svtools/svtdata.hxx
@@ -47,7 +47,7 @@ private:
 
 public:
     ResMgr * GetResMgr(const ::com::sun::star::lang::Locale aLocale);
-    ResMgr * GetResMgr(); // VCL dependant, only available in SVT, not in SVL!
+    ResMgr * GetResMgr(); // VCL dependent, only available in SVT, not in SVL!
 
     static ImpSvtData & GetSvtData();
 };
@@ -58,7 +58,7 @@ class SVT_DLLPUBLIC SvtResId: public ResId
 public:
     SvtResId(sal_uInt16 nId, const ::com::sun::star::lang::Locale aLocale);
     SvtResId(sal_uInt16 nId);
-     // VCL dependant, only available in SVT, not in SVL!
+     // VCL dependent, only available in SVT, not in SVL!
 };
 
 #endif //  _SVTOOLS_SVTDATA_HXX
diff --git a/svtools/inc/svtools/table/tablemodel.hxx b/svtools/inc/svtools/table/tablemodel.hxx
index da3d5681ba28..29b878403ec2 100644
--- a/svtools/inc/svtools/table/tablemodel.hxx
+++ b/svtools/inc/svtools/table/tablemodel.hxx
@@ -189,7 +189,7 @@ namespace svt { namespace table
         /** sets a new column ID
 
             @return
-                <TRUE/> if setting the new ID was successfull. A possible error
+                <TRUE/> if setting the new ID was successful. A possible error
                 conditions is if you try to set an ID which is already used
                 by another column within the same table.
 
diff --git a/svtools/inc/svtools/textview.hxx b/svtools/inc/svtools/textview.hxx
index 46a9cf0e6047..a3a2447ac669 100644
--- a/svtools/inc/svtools/textview.hxx
+++ b/svtools/inc/svtools/textview.hxx
@@ -205,7 +205,7 @@ public:
 
     /**
         Drag and Drop, deleting and selection regards all text that has an attribute
-        TEXTATTR_PROTECTED set as one entitity. Drag and dropped text is automatically
+        TEXTATTR_PROTECTED set as one entity. Drag and dropped text is automatically
         attibuted as protected.
      */
     void                SupportProtectAttribute(sal_Bool bSupport);
diff --git a/svtools/inc/svtools/valueset.hxx b/svtools/inc/svtools/valueset.hxx
index f52710c78f64..ffe6366b5bee 100644
--- a/svtools/inc/svtools/valueset.hxx
+++ b/svtools/inc/svtools/valueset.hxx
@@ -436,7 +436,7 @@ public:
 
 private:
     /** Determine whether RTL (right to left writing) is active.  For this
-        method to return <true/> two conditions have to be fullfilled:
+        method to return <true/> two conditions have to be fulfilled:
         <ol><li>RTL is active for the whole application.</li>
         <li>RTL is enabled for the control.</li></ol>
         @return
diff --git a/svtools/inc/svtools/wizardmachine.hxx b/svtools/inc/svtools/wizardmachine.hxx
index b60d8246271d..6efe937eb179 100644
--- a/svtools/inc/svtools/wizardmachine.hxx
+++ b/svtools/inc/svtools/wizardmachine.hxx
@@ -288,7 +288,7 @@ namespace svt
             method is able to determine the next state without actually having the page of the current state.
 
             @return
-                <TRUE/> if and only if traveling was successfull
+                <TRUE/> if and only if traveling was successful
 
             @see skipUntil
             @see skipBackwardUntil
@@ -304,7 +304,7 @@ namespace svt
             The skipped states appear in the state history, so <method>travelPrevious</method> will make use of them.
 
             @return
-                <TRUE/> if and only if traveling was successfull
+                <TRUE/> if and only if traveling was successful
 
             @see skip
             @see skipBackwardUntil
@@ -322,7 +322,7 @@ namespace svt
             you from this.
 
             @return
-                <TRUE/> if and only if traveling was successfull
+                <TRUE/> if and only if traveling was successful
 
             @see skipUntil
             @see skip