scp2/source/ooo/file_library_ooo.scp | 65 ++++++++++++++++++-----------------
sfx2/inc/sfx2/tabdlg.hxx | 4 ++
sfx2/source/dialog/tabdlg.cxx | 19 ++++++++--
3 files changed, 53 insertions(+), 35 deletions(-)
New commits:
commit 58548484f734596a43dffa2810812fee42252437
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jun 26 14:31:12 2012 +0100
save tabdialog settings in dtor as well as ::Ok
Change-Id: Ia279c7cf6e319cba8ee185fd7158f7aa7b504008
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index 36d7891..aa77164 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -119,6 +119,10 @@ protected:
*/
bool PrepareLeaveCurrentPage();
+ /** save the position of the TabDialog and which tab page is the currently
active one
+ */
+ void SavePosAndId();
+
public:
SfxTabDialog( Window* pParent, const ResId &rResId, const SfxItemSet * = 0,
sal_Bool bEditFmt = sal_False, const String *pUserButtonText
= 0 );
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 5d84118..342dc47 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -468,6 +468,8 @@ SfxTabDialog::SfxTabDialog
SfxTabDialog::~SfxTabDialog()
{
+ SavePosAndId();
+
const sal_uInt16 nCount = pImpl->pData->Count();
for ( sal_uInt16 i = 0; i < nCount; ++i )
{
@@ -871,6 +873,14 @@ SfxTabPage* SfxTabDialog::GetTabPage( sal_uInt16 nPageId )
const
return NULL;
}
+void SfxTabDialog::SavePosAndId()
+{
+ // save settings (screen position and current page)
+ SvtViewOptions aDlgOpt( E_TABDIALOG, String::CreateFromInt32( nResId ) );
+
aDlgOpt.SetWindowState(OStringToOUString(GetWindowState(WINDOWSTATE_MASK_POS),RTL_TEXTENCODING_ASCII_US));
+ aDlgOpt.SetPageID( aTabCtrl.GetCurPageId() );
+}
+
// -----------------------------------------------------------------------
short SfxTabDialog::Ok()
@@ -893,10 +903,7 @@ short SfxTabDialog::Ok()
*/
{
- // save settings (screen position and current page)
- SvtViewOptions aDlgOpt( E_TABDIALOG, String::CreateFromInt32( nResId ) );
-
aDlgOpt.SetWindowState(OStringToOUString(GetWindowState(WINDOWSTATE_MASK_POS),RTL_TEXTENCODING_ASCII_US));
- aDlgOpt.SetPageID( aTabCtrl.GetCurPageId() );
+ SavePosAndId(); //See fdo#38828 "Apply" resetting window position
pImpl->bInOK = sal_True;
commit d800847be075dc7420e2655ba8167cc4f9436dc9
Author: Travis Carter <b...@traviswcarter.com>
Date: Thu Jun 21 19:25:19 2012 -0500
Properly store dialog's position and current page
Dialog's position and current page weren't always being stored. Moved code
from the destructor to SfxTabDialog::Ok() so that it will execute everytime Ok
or Apply is clicked.
Change-Id: Iddee68a7b22749db50c8c78613be11c8ba5500c6
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 9096f8c..5d84118 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -468,11 +468,6 @@ SfxTabDialog::SfxTabDialog
SfxTabDialog::~SfxTabDialog()
{
- // save settings (screen position and current page)
- SvtViewOptions aDlgOpt( E_TABDIALOG, String::CreateFromInt32( nResId ) );
-
aDlgOpt.SetWindowState(OStringToOUString(GetWindowState(WINDOWSTATE_MASK_POS),RTL_TEXTENCODING_ASCII_US));
- aDlgOpt.SetPageID( aTabCtrl.GetCurPageId() );
-
const sal_uInt16 nCount = pImpl->pData->Count();
for ( sal_uInt16 i = 0; i < nCount; ++i )
{
@@ -883,6 +878,10 @@ short SfxTabDialog::Ok()
/* [Description]
Ok handler for the Dialogue.
+
+ Dialog's current location and current page are saved for the next time
+ the dialog is shown.
+
The OutputSet is created and for each page this or the special OutputSet
is set by calling the method <SfxTabPage::FillItemSet(SfxItemSet &)>, to
insert the entered data by the user into the set.
@@ -894,6 +893,11 @@ short SfxTabDialog::Ok()
*/
{
+ // save settings (screen position and current page)
+ SvtViewOptions aDlgOpt( E_TABDIALOG, String::CreateFromInt32( nResId ) );
+
aDlgOpt.SetWindowState(OStringToOUString(GetWindowState(WINDOWSTATE_MASK_POS),RTL_TEXTENCODING_ASCII_US));
+ aDlgOpt.SetPageID( aTabCtrl.GetCurPageId() );
+
pImpl->bInOK = sal_True;
if ( !pOutSet )
commit f3daae2f80bbe5dae7e9eb14b8ac346dd73a2968
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jun 26 14:14:35 2012 +0100
get the right inclusion rules for nss libs
Change-Id: I119a012f1b0e9fe06d15b7e41fe7ac140bb83629
diff --git a/scp2/source/ooo/file_library_ooo.scp
b/scp2/source/ooo/file_library_ooo.scp
index b1c38c3..4b9ecb6 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1326,6 +1326,40 @@ SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
#endif
#endif
+//we need the nss libs of libxmlsec is enabled, or if the internal mozilla is
enabled
+#if defined(ENABLE_XMLSEC) || !defined(SYSTEM_MOZILLA) &&
!defined(WITHOUT_MOZILLA)
+#ifndef SYSTEM_NSS
+SPECIAL_LIB_FILE(gid_File_Lib_Freebl3,freebl3)
+SPECIAL_LIB_FILE(gid_File_Lib_Nss3,nss3)
+SPECIAL_LIB_FILE(gid_File_Lib_Nspr,nspr4)
+SPECIAL_LIB_FILE(gid_File_Lib_Nssdbm3,nssdbm3)
+SPECIAL_LIB_FILE(gid_File_Lib_Nssutil3,nssutil3)
+SPECIAL_LIB_FILE(gid_File_Lib_Nssckbi,nssckbi)
+SPECIAL_LIB_FILE(gid_File_Lib_Plc4,plc4)
+SPECIAL_LIB_FILE(gid_File_Lib_Plds4,plds4)
+SPECIAL_LIB_FILE(gid_File_Lib_Softokn3,softokn3)
+SPECIAL_LIB_FILE(gid_File_Lib_Smime3,smime3)
+#ifdef WNT
+SPECIAL_LIB_FILE(gid_File_Lib_Sqlite3,sqlite3)
+#else
+/*
+ For MacOSX >= 10.6 we can apparently use the system sqlite.
+
+ For MacOSX 10.4 we've delivered sqlite into a sqlite subdir for the duration
+ of the build to avoid #i106132#. Now we need to put it into the program dir of
+ the install.
+*/
+#if !defined(MACOS) || (MAC_OS_X_VERSION_MIN_REQUIRED < 1060)
+File gid_File_Lib_Sqlite3
+ Name = "sqlite/" SPECIAL_NAME(sqlite3);
+ PACKED_LIB_FILE_BODY;
+End
+#endif //!defined(MACOS) || (MAC_OS_X_VERSION_MIN_REQUIRED < 1060)
+#endif //WNT
+SPECIAL_LIB_FILE(gid_File_Lib_Ssl3,ssl3)
+#endif //SYSTEM_NSS
+#endif //defined(ENABLE_XMLSEC) || !defined(SYSTEM_MOZILLA) &&
!defined(WITHOUT_MOZILLA)
+
SPECIAL_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1)
SPECIAL_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1)
@@ -1466,37 +1500,6 @@ File gid_File_Lib_XSec_XmlSec
Styles = (PACKED);
End
-#ifndef SYSTEM_NSS
-SPECIAL_LIB_FILE(gid_File_Lib_Freebl3,freebl3)
-SPECIAL_LIB_FILE(gid_File_Lib_Nss3,nss3)
-SPECIAL_LIB_FILE(gid_File_Lib_Nspr,nspr4)
-SPECIAL_LIB_FILE(gid_File_Lib_Nssdbm3,nssdbm3)
-SPECIAL_LIB_FILE(gid_File_Lib_Nssutil3,nssutil3)
-SPECIAL_LIB_FILE(gid_File_Lib_Nssckbi,nssckbi)
-SPECIAL_LIB_FILE(gid_File_Lib_Plc4,plc4)
-SPECIAL_LIB_FILE(gid_File_Lib_Plds4,plds4)
-SPECIAL_LIB_FILE(gid_File_Lib_Softokn3,softokn3)
-SPECIAL_LIB_FILE(gid_File_Lib_Smime3,smime3)
-#ifdef WNT
-SPECIAL_LIB_FILE(gid_File_Lib_Sqlite3,sqlite3)
-#else
-/*
- For MacOSX >= 10.6 we can apparently use the system sqlite.
-
- For MacOSX 10.4 we've delivered sqlite into a sqlite subdir for the duration
- of the build to avoid #i106132#. Now we need to put it into the program dir of
- the install.
-*/
-#if !defined(MACOS) || (MAC_OS_X_VERSION_MIN_REQUIRED < 1060)
-File gid_File_Lib_Sqlite3
- Name = "sqlite/" SPECIAL_NAME(sqlite3);
- PACKED_LIB_FILE_BODY;
-End
-#endif
-#endif
-SPECIAL_LIB_FILE(gid_File_Lib_Ssl3,ssl3)
-#endif
-
#ifdef WNT
File gid_File_Lib_LibXMLSec_xmlseccore
LIB_FILE_BODY;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
