CWS-TOOLING: integrate CWS calc57

5 files changed, 37 insertions, 32 deletions

diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx
index 2f23166966b67..82c276d98f2cd 100644
--- a/sc/source/ui/cctrl/dpcontrol.cxx
+++ b/sc/source/ui/cctrl/dpcontrol.cxx
@@ -975,7 +975,7 @@ ScDPFieldPopupWindow::ScDPFieldPopupWindow(Window* pParent, ScDocument* pDoc) :
     mnCurTabStop(0),
     mpExtendedData(NULL),
     mpOKAction(NULL),
-    maWndSize(160, 330),
+    maWndSize(240, 330),
     mePrevToggleAllState(STATE_DONTKNOW)
 {
     maTabStopCtrls.reserve(7);
@@ -1048,7 +1048,7 @@ void ScDPFieldPopupWindow::getSectionPosSize(Point& rPos, Size& rSize, SectionTy
     const sal_uInt16 nMenuHeight = 60;
     const sal_uInt16 nSingleItemBtnAreaHeight = 32; // height of the middle area below the list box where the single-action buttons are.
     const sal_uInt16 nBottomBtnAreaHeight = 50;     // height of the bottom area where the OK and Cancel buttons are.
-    const sal_uInt16 nBtnWidth = 60;
+    const sal_uInt16 nBtnWidth = 90;
     const sal_uInt16 nLabelHeight = static_cast< sal_uInt16 >( getLabelFont().GetHeight() );
     const sal_uInt16 nBtnHeight = nLabelHeight*2;
     const sal_uInt16 nBottomMargin = 10;
@@ -1105,7 +1105,7 @@ void ScDPFieldPopupWindow::getSectionPosSize(Point& rPos, Size& rSize, SectionTy
         {
             long h = 26;
             rPos = Point(nListBoxMargin, nSingleBtnAreaY);
-            rPos.X() += 75;
+            rPos.X() += 150;
             rPos.Y() += (nSingleItemBtnAreaHeight - h)/2;
             rSize = Size(h, h);
         }
@@ -1114,7 +1114,7 @@ void ScDPFieldPopupWindow::getSectionPosSize(Point& rPos, Size& rSize, SectionTy
         {
             long h = 26;
             rPos = Point(nListBoxMargin, nSingleBtnAreaY);
-            rPos.X() += 75 + h + 10;
+            rPos.X() += 150 + h + 10;
             rPos.Y() += (nSingleItemBtnAreaHeight - h)/2;
             rSize = Size(h, h);
         }
diff --git a/sc/source/ui/dbgui/textimportoptions.src b/sc/source/ui/dbgui/textimportoptions.src
index fff3c4b40749f..69e2d69b31421 100644
--- a/sc/source/ui/dbgui/textimportoptions.src
+++ b/sc/source/ui/dbgui/textimportoptions.src
@@ -33,34 +33,34 @@
 ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS
 {
     Text [ en-US ] = "Import Options" ;
-    Size = MAP_APPFONT ( 190 , 101 ) ;
+    Size = MAP_APPFONT ( 230 , 101 ) ;
     Moveable = TRUE ;
     Closeable = TRUE ;
     OutputSize = TRUE ;
 
     OKButton BTN_OK
     {
-        Pos = MAP_APPFONT ( 135, 6 ) ;
+        Pos = MAP_APPFONT ( 175, 6 ) ;
         Size = MAP_APPFONT ( 50, 14 ) ;
         DefButton = TRUE ;
     };
 
     CancelButton BTN_CANCEL
     {
-        Pos = MAP_APPFONT ( 135, 23 ) ;
+        Pos = MAP_APPFONT ( 175, 23 ) ;
         Size = MAP_APPFONT ( 50, 14 ) ;
     };
 
     HelpButton BTN_HELP
     {
-        Pos = MAP_APPFONT ( 135, 43 ) ;
+        Pos = MAP_APPFONT ( 175, 43 ) ;
         Size = MAP_APPFONT ( 50, 14 ) ;
     };
 
     FixedLine FL_CHOOSE_LANG
     {
         Pos = MAP_APPFONT( 6, 3 ) ;
-        Size = MAP_APPFONT( 125, 14 ) ;
+        Size = MAP_APPFONT( 165, 14 ) ;
 
         Text [ en-US ] = "Select the language to use for import" ;
     };
@@ -68,7 +68,7 @@ ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS
     RadioButton RB_AUTOMATIC
     {
         Pos = MAP_APPFONT( 12, 20 ) ;
-        Size = MAP_APPFONT( 50, 10 ) ;
+        Size = MAP_APPFONT( 159, 10 ) ;
         TabStop = TRUE ;
 
         Text [ en-US ] = "Automatic" ;
@@ -77,7 +77,7 @@ ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS
     RadioButton RB_CUSTOM
     {
         Pos = MAP_APPFONT( 12, 34 ) ;
-        Size = MAP_APPFONT( 50, 10 ) ;
+        Size = MAP_APPFONT( 159, 10 ) ;
         TabStop = TRUE ;
 
         Text [ en-US ] = "Custom" ;
@@ -86,7 +86,7 @@ ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS
     ListBox LB_CUSTOM_LANG
     {
         Pos = MAP_APPFONT( 20, 50 ) ;
-        Size = MAP_APPFONT( 100, 55 ) ;
+        Size = MAP_APPFONT( 140, 120 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         Sort = TRUE ;
@@ -94,19 +94,17 @@ ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS
 
     FixedLine FL_OPTION
     {
-    Pos = MAP_APPFONT( 6, 70 );
-    Size = MAP_APPFONT( 125, 14 );
-
-    Text [ en-US ] = "Options" ;
+       Pos = MAP_APPFONT( 6, 70 );
+       Size = MAP_APPFONT( 165, 14 );
+       Text [ en-US ] = "Options" ;
     };
 
     CheckBox BTN_CONVERT_DATE
     {
         Pos = MAP_APPFONT( 12, 86 );
-    Size = MAP_APPFONT( 125, 10 );
-    TabStop = TRUE ;
-
-    Text [ en-US ] = "Detect special numbers (such as dates)." ;
+        Size = MAP_APPFONT( 159, 10 );
+        TabStop = TRUE ;
+        Text [ en-US ] = "Detect special numbers (such as dates)." ;
     };
 };
 
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 0569e95605b1f..7fa31246275ac 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -2024,7 +2024,7 @@ SfxObjectShellRef ScExternalRefManager::loadSrcDocument(sal_uInt16 nFileId, Stri
     if (!isFileLoadable(aFile))
         return NULL;
 
-    String aOptions;
+    String aOptions( pFileData->maFilterOptions );
     ScDocumentLoader::GetFilterName(aFile, rFilter, aOptions, true, false);
     const SfxFilter* pFilter = ScDocShell::Factory().GetFilterContainer()->GetFilter4FilterName(rFilter);
 
@@ -2040,9 +2040,6 @@ SfxObjectShellRef ScExternalRefManager::loadSrcDocument(sal_uInt16 nFileId, Stri
         setRelativeFileName(nFileId, aStr);
     }
 
-    // Update the filter data now that we are loading it again.
-    setFilterData(nFileId, rFilter, aOptions);
-
     SfxItemSet* pSet = new SfxAllItemSet(SFX_APP()->GetPool());
     if (aOptions.Len())
         pSet->Put(SfxStringItem(SID_FILE_FILTEROPTIONS, aOptions));
@@ -2077,6 +2074,13 @@ SfxObjectShellRef ScExternalRefManager::loadSrcDocument(sal_uInt16 nFileId, Stri
     pExtOptNew->GetDocSettings().mnLinkCnt = nLinkCount + 1;
 
     pNewShell->DoLoad(pMedium.release());
+
+    // with UseInteractionHandler, options may be set by dialog during DoLoad
+    String aNew = ScDocumentLoader::GetOptions(*pNewShell->GetMedium());
+    if (aNew.Len() && aNew != aOptions)
+        aOptions = aNew;
+    setFilterData(nFileId, rFilter, aOptions);    // update the filter data, including the new options
+
     return aRef;
 }
 
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index ea7cabf7716dc..4c64e312bc2d9 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -152,13 +152,13 @@ TabPage RID_SCPAGE_CALC
     CheckBox BTN_GENERAL_PREC
     {
         Pos = MAP_APPFONT ( 12 , 147 ) ;
-        Size = MAP_APPFONT ( 136 , 10 ) ;
+        Size = MAP_APPFONT ( 148 , 10 ) ;
         Text [ en-US ] = "Limit decimals for general number format" ;
     };
     FixedText FT_PREC
     {
-        Pos = MAP_APPFONT ( 150 , 148 ) ;
-        Size = MAP_APPFONT ( 72 , 8 ) ;
+        Pos = MAP_APPFONT ( 138 , 148 ) ;
+        Size = MAP_APPFONT ( 84 , 8 ) ;
         Text [ en-US ] = "~Decimal places" ;
         Right = TRUE ;
     };
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index 75e415b8f0189..a680185a1d1cb 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -193,11 +193,14 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue(
                         if (pPrinter)
                         {
                             String aString(sPrinterName);
-                            SfxPrinter* pNewPrinter = new SfxPrinter( pPrinter->GetOptions().Clone(), aString );
-                            if (pNewPrinter->IsKnown())
-                                pDocShell->SetPrinter( pNewPrinter, SFX_PRINTER_PRINTER );
-                            else
-                                delete pNewPrinter;
+                            if (pPrinter->GetName() != aString)
+                            {
+                                SfxPrinter* pNewPrinter = new SfxPrinter( pPrinter->GetOptions().Clone(), aString );
+                                if (pNewPrinter->IsKnown())
+                                    pDocShell->SetPrinter( pNewPrinter, SFX_PRINTER_PRINTER );
+                                else
+                                    delete pNewPrinter;
+                            }
                         }
                         else
                             throw uno::RuntimeException();