[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - connectivity/source desktop/win32 sd/source setup_native/source

Armin Le Grand alg at apache.org
Tue Oct 8 09:08:28 PDT 2013


 connectivity/source/resource/conn_shared_res.src                               |   14 +-
 desktop/win32/source/setup/setup.ulf                                           |    2 
 sd/source/core/sdpage.cxx                                                      |   47 ++++++++++
 setup_native/source/win32/customactions/shellextensions/registerextensions.cxx |   12 +-
 setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx       |    6 -
 5 files changed, 64 insertions(+), 17 deletions(-)

New commits:
commit b94437b6dfe60904f9c89608c15ed55dc3ce277d
Author: Armin Le Grand <alg at apache.org>
Date:   Tue Oct 8 15:40:15 2013 +0000

    i119056 Added direct refreshes for objects dependent of HeaderFooterSettings

diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 48cddd1..2945e84 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2810,9 +2810,56 @@ void SdPage::setHeaderFooterSettings( const sd::HeaderFooterSettings& rNewSettin
     }
 
     SetChanged();
+
     if(TRG_HasMasterPage())
     {
         TRG_GetMasterPageDescriptorViewContact().ActionChanged();
+
+        // #119056# For HeaderFooterSettings SdrObjects are used, but the properties
+        // used are not part of their model data, but kept in SD. This data is applied
+        // using a 'backdoor' on primitive creation. Thus, the normal mechanism to detect
+        // object changes does not work here. It is neccessary to trigger updates here
+        // directly. BroadcastObjectChange used for PagePreview invalidations,
+        // flushViewObjectContacts used to invalidate and flush all visualizations in
+        // edit views.
+        SdPage* pMasterPage = dynamic_cast< SdPage* >(&TRG_GetMasterPage());
+
+        if(pMasterPage)
+        {
+            SdrObject* pCandidate = 0;
+
+            pCandidate = pMasterPage->GetPresObj( PRESOBJ_HEADER );
+
+            if(pCandidate)
+            {
+                pCandidate->BroadcastObjectChange();
+                pCandidate->GetViewContact().flushViewObjectContacts();
+            }
+
+            pCandidate = pMasterPage->GetPresObj( PRESOBJ_DATETIME );
+
+            if(pCandidate)
+            {
+                pCandidate->BroadcastObjectChange();
+                pCandidate->GetViewContact().flushViewObjectContacts();
+            }
+
+            pCandidate = pMasterPage->GetPresObj( PRESOBJ_FOOTER );
+
+            if(pCandidate)
+            {
+                pCandidate->BroadcastObjectChange();
+                pCandidate->GetViewContact().flushViewObjectContacts();
+            }
+
+            pCandidate = pMasterPage->GetPresObj( PRESOBJ_SLIDENUMBER );
+
+            if(pCandidate)
+            {
+                pCandidate->BroadcastObjectChange();
+                pCandidate->GetViewContact().flushViewObjectContacts();
+            }
+        }
     }
 }
 
commit 32c62655723779327cca683bfc9c7096b445580c
Author: Jürgen Schmidt <jsc at apache.org>
Date:   Tue Oct 8 15:16:53 2013 +0000

    #123428# correct spelling, occured -> occurred

diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src
index dd2b0ec..8009f62 100644
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.src
@@ -123,7 +123,7 @@ String STR_STMT_TYPE_NOT_SUPPORTED
 
 String STR_UNSPECIFIED_ERROR
 {
-    Text [ en-US ] = "An unknown error occured.";
+    Text [ en-US ] = "An unknown error occurred.";
 };
 
 String STR_COULD_NOT_CREATE_ADDRESSBOOK
@@ -138,12 +138,12 @@ String STR_COULD_NOT_LOAD_LIB
 
 String STR_ERROR_REFRESH_ROW
 {
-    Text [ en-US ] = "An error occured while refreshing the current row.";
+    Text [ en-US ] = "An error occurred while refreshing the current row.";
 };
 
 String STR_ERROR_GET_ROW
 {
-    Text [ en-US ] = "An error occured while getting the current row.";
+    Text [ en-US ] = "An error occurred while getting the current row.";
 };
 
 String STR_CAN_NOT_CANCEL_ROW_UPDATE
@@ -163,7 +163,7 @@ String STR_QUERY_INVALID_IS_NULL_COLUMN
 
 String STR_ILLEGAL_MOVEMENT
 {
-    Text [ en-US ] = "Illegal cursor movement occured.";
+    Text [ en-US ] = "Illegal cursor movement occurred.";
 };
 
 String STR_COMMIT_ROW
@@ -375,7 +375,7 @@ String STR_NO_CONNECTION
 // dbase
 String STR_COULD_NOT_DELETE_INDEX
 {
-    Text [ en-US ] = "The index could not be deleted. An unknown error while accessing the file system occured.";
+    Text [ en-US ] = "The index could not be deleted. An unknown error while accessing the file system occurred.";
 };
 String STR_ONL_ONE_COLUMN_PER_INDEX
 {
@@ -620,11 +620,11 @@ String STR_INVALID_FILE_URL
 };
 String STR_NO_TABLE_CONTAINER
 {
-    Text [ en-US ] = "An error occured while obtaining the connection's table container.";
+    Text [ en-US ] = "An error occurred while obtaining the connection's table container.";
 };
 String STR_NO_TABLE_EDITOR_DIALOG
 {
-    Text [ en-US ] = "An error occured while creating the table editor dialog.";
+    Text [ en-US ] = "An error occurred while creating the table editor dialog.";
 };
 String STR_NO_TABLENAME
 {
diff --git a/desktop/win32/source/setup/setup.ulf b/desktop/win32/source/setup/setup.ulf
index 4c89218..e649460 100644
--- a/desktop/win32/source/setup/setup.ulf
+++ b/desktop/win32/source/setup/setup.ulf
@@ -67,7 +67,7 @@ en-US = "There is already a setup process running."
 
 
 [%UNKNOWN_ERROR%]
-en-US = "An Unknown Error occured!"
+en-US = "An Unknown Error occurred!"
 
 
 [%INVALID_PROFILE%]
diff --git a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
index 6636be4..bcd8a18 100644
--- a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
@@ -263,7 +263,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
                     }
                     else
                     {
-                        mystr = "An error occured during removing content of " + sCompleteFileName;
+                        mystr = "An error occurred during removing content of " + sCompleteFileName;
                         // MessageBox(NULL, mystr.c_str(), "Error removing directory", MB_OK);
                     }
                 }
@@ -277,7 +277,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
                     }
                     else
                     {
-                        mystr = "An error occured during removal of file " + sCompleteFileName;
+                        mystr = "An error occurred during removal of file " + sCompleteFileName;
                         // MessageBox(NULL, mystr.c_str(), "Error removing file", MB_OK);
                     }
                 }
@@ -302,7 +302,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
         }
         else
         {
-            mystr = "An error occured during removal of empty directory " + sPath;
+            mystr = "An error occurred during removal of empty directory " + sPath;
             // MessageBox(NULL, mystr.c_str(), "Error removing directory", MB_OK);
             bDirectoryRemoved = false;
         }
@@ -339,13 +339,13 @@ extern "C" UINT __stdcall RegisterExtensions(MSIHANDLE handle)
 //          }
 //          else
 //          {
-//              mystr = "An error occured during execution!";
+//              mystr = "An error occurred during execution!";
 //              MessageBox(NULL, mystr.c_str(), "Command", MB_OK);
 //          }
 
         if ( ! fSuccess )
         {
-            mystr = "ERROR: An error occured during registration of extensions!";
+            mystr = "ERROR: An error occurred during registration of extensions!";
             MessageBox(NULL, mystr.c_str(), "ERROR", MB_OK);
             registrationError = true;
         }
@@ -418,7 +418,7 @@ extern "C" UINT __stdcall RemoveExtensions(MSIHANDLE handle)
 //     }
 //     else
 //     {
-//         mystr = "An error occured during execution!";
+//         mystr = "An error occurred during execution!";
 //         MessageBox(NULL, mystr.c_str(), "Main methode", MB_OK);
 //     }
 
diff --git a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
index d288e62..57f5dc2 100644
--- a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
@@ -127,7 +127,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
                     }
                     else
                     {
-                        mystr = "An error occured during removing content of " + sCompleteFileName;
+                        mystr = "An error occurred during removing content of " + sCompleteFileName;
                         // MessageBox(NULL, mystr.c_str(), "Error removing directory", MB_OK);
                     }
                 }
@@ -141,7 +141,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
                     }
                     else
                     {
-                        mystr = "An error occured during removal of file " + sCompleteFileName;
+                        mystr = "An error occurred during removal of file " + sCompleteFileName;
                         // MessageBox(NULL, mystr.c_str(), "Error removing file", MB_OK);
                     }
                 }
@@ -166,7 +166,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
         }
         else
         {
-            mystr = "An error occured during removal of empty directory " + sPath;
+            mystr = "An error occurred during removal of empty directory " + sPath;
             // MessageBox(NULL, mystr.c_str(), "Error removing directory", MB_OK);
             bDirectoryRemoved = false;
         }


More information about the Libreoffice-commits mailing list