chartmultiline: merge with DEV300_m70

52 files changed, 132 insertions, 94 deletions

diff --git a/sc/inc/addruno.hxx b/sc/inc/addruno.hxx
index 1427d9b14a75..c9089ba48d2e 100644
--- a/sc/inc/addruno.hxx
+++ b/sc/inc/addruno.hxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <cppuhelper/implbase2.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include "global.hxx"
 #include "address.hxx"
 
diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx
index ac7d444ca561..843fa673543f 100644
--- a/sc/inc/afmtuno.hxx
+++ b/sc/inc/afmtuno.hxx
@@ -31,8 +31,8 @@
 #ifndef SC_AFMTUNO_HXX
 #define SC_AFMTUNO_HXX
 
-#include <svtools/lstner.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/lstner.hxx>
+#include <svl/itemprop.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XContainer.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx
index 09a1e9ced9ba..05de5a22cc90 100644
--- a/sc/inc/appluno.hxx
+++ b/sc/inc/appluno.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_APPLUNO_HXX
 #define SC_APPLUNO_HXX
 
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sheet/XRecentFunctions.hpp>
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index 8dd77cf68c3f..55bb707f4edb 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -31,9 +31,9 @@
 #ifndef SC_SCATTR_HXX
 #define SC_SCATTR_HXX
 
-#include <svtools/poolitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
 #include "scdllapi.h"
 #include "global.hxx"
 #include "address.hxx"
diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx
index f8df5e9fa236..8ec139ffa2d5 100644
--- a/sc/inc/autoform.hxx
+++ b/sc/inc/autoform.hxx
@@ -64,7 +64,7 @@ JP 20.07.95:
 #include <svx/udlnitem.hxx>
 #include <svx/wghtitem.hxx>
 #include <svx/rotmodit.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/bolnitem.hxx>
 #include "scdllapi.h"
 #include "collect.hxx"
diff --git a/sc/inc/brdcst.hxx b/sc/inc/brdcst.hxx
index 0d4b9aac9fa7..e7418c8dedfe 100644
--- a/sc/inc/brdcst.hxx
+++ b/sc/inc/brdcst.hxx
@@ -33,8 +33,8 @@
 #include "global.hxx"
 #include "address.hxx"
 #include <tools/rtti.hxx>
-#include <svtools/hint.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/hint.hxx>
+#include <svl/smplhint.hxx>
 class ScBaseCell;
 
 #define SC_HINT_DYING       SFX_HINT_DYING
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 1f2bff35ce98..9355176e3a62 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -35,14 +35,14 @@
 
 #include <set>
 #include <tools/mempool.hxx>
-#include <svtools/listener.hxx>
+#include <svl/listener.hxx>
 #include "global.hxx"
 #include "rangenam.hxx"
 #include "formula/grammar.hxx"
 #include "tokenarray.hxx"
 #include "formularesult.hxx"
 #include <rtl/ustrbuf.hxx>
-#include <vcl/fontcvt.hxx>
+#include <unotools/fontcvt.hxx>
 #include "scdllapi.h"
 
 #define USE_MEMPOOL
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 2dd0bd6cc16e..7d0cc1411263 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -35,9 +35,9 @@
 #include "rangelst.hxx"         // ScRangeList
 
 #include "formula/grammar.hxx"
-#include <svtools/lstner.hxx>
-#include <svtools/listener.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/lstner.hxx>
+#include <svl/listener.hxx>
+#include <svl/itemprop.hxx>
 #include <com/sun/star/table/XTableChartsSupplier.hpp>
 #include <com/sun/star/chart/XChartDataArray.hpp>
 #include <com/sun/star/text/XTextFieldsSupplier.hpp>
@@ -152,8 +152,10 @@ public:
 namespace ooo
 {
     namespace vba {
+        namespace excel {
     class ScVbaCellRangeAccess;  // Vba Helper class
     }
+    }
 }
 
 class SC_DLLPUBLIC ScCellRangesBase : public com::sun::star::beans::XPropertySet,
@@ -175,7 +177,7 @@ class SC_DLLPUBLIC ScCellRangesBase : public com::sun::star::beans::XPropertySet
 {
     friend class ScTabViewObj;      // fuer select()
     friend class ScTableSheetObj;   // fuer createCursorByRange()
-     friend class ooo::vba::ScVbaCellRangeAccess;
+     friend class ooo::vba::excel::ScVbaCellRangeAccess;
 
 private:
     const SfxItemPropertySet* pPropSet;
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index 85ceaef9fefb..197e35e89f01 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -37,7 +37,7 @@
 #include "token.hxx"
 #include "chartlis.hxx"
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <com/sun/star/chart2/data/XRangeXMLConversion.hpp>
@@ -59,7 +59,7 @@
 #include <cppuhelper/implbase6.hxx>
 #include <cppuhelper/implbase7.hxx>
 #include <rtl/ustring.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 #include <hash_set>
 #include <list>
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index 490c62743fb4..0ebc84268f74 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -33,7 +33,7 @@
 
 
 #include <vcl/timer.hxx>
-#include <svtools/listener.hxx>
+#include <svl/listener.hxx>
 #include "collect.hxx"
 #include "rangelst.hxx"
 #include "token.hxx"
diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx
index 914c48393573..7c82b4874fca 100644
--- a/sc/inc/chartuno.hxx
+++ b/sc/inc/chartuno.hxx
@@ -32,7 +32,7 @@
 #define SC_CHARTUNO_HXX
 
 #include "address.hxx"
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <tools/string.hxx>
 
 #include <com/sun/star/table/XTableChart.hpp>
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index 6707473f5610..0018f8b2ac3c 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -39,7 +39,7 @@
 #include <tools/queue.hxx>
 #include <tools/mempool.hxx>
 #include <tools/link.hxx>
-#include <svtools/lstner.hxx>
+#include <unotools/options.hxx>
 #include "global.hxx"
 #include "bigrange.hxx"
 #include "collect.hxx"
@@ -994,9 +994,7 @@ DECLARE_TABLE( ScChangeActionTable, ScChangeAction* )
 // "normalen" Actions in die Quere zu kommen.
 #define SC_CHGTRACK_GENERATED_START ((UINT32) 0xfffffff0)
 
-// SfxListener an der Applikation, um Aenderungen des Usernamens mitzubekommen
-
-class ScChangeTrack : public SfxListener
+class ScChangeTrack : public utl::ConfigurationListener
 {
     friend void ScChangeAction::RejectRestoreContents( ScChangeTrack*, SCsCOL, SCsROW );
     friend BOOL ScChangeActionDel::Reject( ScDocument* pDoc );
@@ -1059,7 +1057,6 @@ class ScChangeTrack : public SfxListener
                                     const ScBaseCell* pOldCell,
                                     const ScBaseCell* pNewCell );
 
-    virtual void                Notify( SfxBroadcaster&, const SfxHint& );
             void                Init();
             void                DtorClear();
             void                SetLoadSave( BOOL bVal ) { bLoadSave = bVal; }
@@ -1130,6 +1127,7 @@ class ScChangeTrack : public SfxListener
 #endif  // SC_CHGTRACK_CXX
 
             void                ClearMsgQueue();
+    virtual void                ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
 
 public:
 
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 141cb5706515..f659c52d0892 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -34,7 +34,7 @@
 #include "global.hxx"
 #include "address.hxx"
 #include "formula/grammar.hxx"
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include "scdllapi.h"
 
 class ScBaseCell;
diff --git a/sc/inc/confuno.hxx b/sc/inc/confuno.hxx
index a7327402e5e0..a82e4fad1a09 100644
--- a/sc/inc/confuno.hxx
+++ b/sc/inc/confuno.hxx
@@ -31,8 +31,8 @@
 #ifndef SC_CONFUNO_HXX
 #define SC_CONFUNO_HXX
 
-#include <svtools/itemprop.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/itemprop.hxx>
+#include <svl/lstner.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <cppuhelper/implbase2.hxx>
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index c3d5db0bc72b..86f395f525ca 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -34,8 +34,8 @@
 #include "global.hxx"
 #include "dpobject.hxx"
 #include "rangeutl.hxx"     // ScArea
-#include <svtools/lstner.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/lstner.hxx>
+#include <svl/itemprop.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index a93bfc341573..6cd2d1555bdf 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -32,8 +32,8 @@
 #define SC_DATAUNO_HXX
 
 #include "global.hxx"
-#include <svtools/itemprop.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/itemprop.hxx>
+#include <svl/lstner.hxx>
 #include <com/sun/star/sheet/TableFilterField.hpp>
 #include <com/sun/star/sheet/GeneralFunction.hpp>
 #include <com/sun/star/sheet/XCellRangeReferrer.hpp>
diff --git a/sc/inc/defltuno.hxx b/sc/inc/defltuno.hxx
index 2f33dcdb3f48..b93c386a77f0 100644
--- a/sc/inc/defltuno.hxx
+++ b/sc/inc/defltuno.hxx
@@ -31,12 +31,12 @@
 #ifndef SC_DEFLTUNO_HXX
 #define SC_DEFLTUNO_HXX
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <cppuhelper/implbase3.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 class ScDocShell;
 
diff --git a/sc/inc/detdata.hxx b/sc/inc/detdata.hxx
index 06beb91790f1..b16b5a05778c 100644
--- a/sc/inc/detdata.hxx
+++ b/sc/inc/detdata.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_DETDATA_HXX
 #define SC_DETDATA_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include "global.hxx"
 #include "address.hxx"
 
diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx
index 34578c64bacf..b09a064ee797 100644
--- a/sc/inc/dispuno.hxx
+++ b/sc/inc/dispuno.hxx
@@ -34,8 +34,8 @@
 #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
 #include <cppuhelper/implbase2.hxx>
-#include <svtools/lstner.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/lstner.hxx>
+#include <svl/svarray.hxx>
 #include "global.hxx"       // ScImportParam
 
 
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index 325060f0c05a..f102b5ea966d 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.hxx
@@ -32,8 +32,8 @@
 #define SC_DOCOPTIO_HXX
 
 #include <unotools/configitem.hxx>
-#include <svtools/poolitem.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/itemprop.hxx>
 #include "scdllapi.h"
 #include "optutil.hxx"
 
diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx
index c81a68afe63d..52cf1a968163 100644
--- a/sc/inc/docpool.hxx
+++ b/sc/inc/docpool.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_SCDOCPOL_HXX
 #define SC_SCDOCPOL_HXX
 
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include "scdllapi.h"
 
 class ScStyleSheet;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 5f75108c2ebf..116d25ee901e 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -155,7 +155,7 @@ namespace com { namespace sun { namespace star {
     }
 } } }
 
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 /*
 #ifdef _ZFORLIST_DECLARE_TABLE
 class SvNumberFormatterIndexTable;
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 5966e446d0c3..95d9ebc35a7c 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -33,7 +33,7 @@
 
 #include "address.hxx"
 #include <sfx2/sfxbasemodel.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svx/fmdmod.hxx>
 #include <com/sun/star/view/XRenderable.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
@@ -61,7 +61,7 @@
 #include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/interfacecontainer.h>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include "drwlayer.hxx"
 
 class ScDocShell;
@@ -75,6 +75,7 @@ class ScTableSheetObj;
 class SvxFmDrawPage;
 class SvxDrawPage;
 class ScRangeList;
+class ScPrintUIOptions;
 class ScSheetSaveData;
 
 class SC_DLLPUBLIC ScModelObj : public SfxBaseModel,
@@ -98,6 +99,7 @@ private:
     SfxItemPropertySet      aPropSet;
     ScDocShell*             pDocShell;
     ScPrintFuncCache*       pPrintFuncCache;
+    ScPrintUIOptions*       pPrinterOptions;
     com::sun::star::uno::Reference<com::sun::star::uno::XAggregation> xNumberAgg;
     com::sun::star::uno::Reference<com::sun::star::uno::XInterface> xDrawGradTab;
     com::sun::star::uno::Reference<com::sun::star::uno::XInterface> xDrawHatchTab;
@@ -110,7 +112,8 @@ private:
     ::cppu::OInterfaceContainerHelper maChangesListeners;
 
     BOOL                    FillRenderMarkData( const com::sun::star::uno::Any& aSelection,
-                                                ScMarkData& rMark, ScPrintSelectionStatus& rStatus ) const;
+                                                const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rOptions,
+                                                ScMarkData& rMark, ScPrintSelectionStatus& rStatus, String& rPagesStr ) const;
     com::sun::star::uno::Reference<com::sun::star::uno::XAggregation> GetFormatter();
 
     rtl::OUString           maBuildId;
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index 6dfb782b2313..b18ea8e56b76 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_DPTABRES_HXX
 #define SC_DPTABRES_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include <com/sun/star/sheet/MemberResult.hpp>
 #include <com/sun/star/sheet/DataResult.hpp>
diff --git a/sc/inc/drawattr.hxx b/sc/inc/drawattr.hxx
index 174b675ebcae..ad0ce37e35c3 100644
--- a/sc/inc/drawattr.hxx
+++ b/sc/inc/drawattr.hxx
@@ -30,7 +30,7 @@
 #ifndef _IDLITEMS_HXX
 #define _IDLITEMS_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/svxenum.hxx>
 
 
diff --git a/sc/inc/drdefuno.hxx b/sc/inc/drdefuno.hxx
index 7eb45d3ea355..4b0a534dc655 100644
--- a/sc/inc/drdefuno.hxx
+++ b/sc/inc/drdefuno.hxx
@@ -32,7 +32,7 @@
 #define SC_DRDEFUNO_HXX
 
 #include <svx/unopool.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 class ScDocShell;
 
diff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxx
index 950c3533e44a..3dd928384fe8 100644
--- a/sc/inc/editsrc.hxx
+++ b/sc/inc/editsrc.hxx
@@ -33,7 +33,7 @@
 
 #include "address.hxx"
 #include <svx/unoedsrc.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 #include <memory>
 
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index bf795f04fe1c..90adedd6d346 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -37,7 +37,7 @@
 #include "sfx2/lnkbase.hxx"
 #include "tools/time.hxx"
 #include "vcl/timer.hxx"
-#include "svtools/zforlist.hxx"
+#include "svl/zforlist.hxx"
 #include "scmatrix.hxx"
 
 #include <hash_map>
diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx
index d4319bcba50e..6d777b38424a 100644
--- a/sc/inc/fielduno.hxx
+++ b/sc/inc/fielduno.hxx
@@ -34,8 +34,8 @@
 #include "address.hxx"
 #include "mutexhlp.hxx"
 
-#include <svtools/lstner.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/lstner.hxx>
+#include <svl/itemprop.hxx>
 #include <svx/editdata.hxx>
 #include <com/sun/star/text/XTextField.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx
index 6005a849fb0f..ccd93d982bdf 100644
--- a/sc/inc/fmtuno.hxx
+++ b/sc/inc/fmtuno.hxx
@@ -35,7 +35,7 @@
 #include "conditio.hxx"
 #include <formula/grammar.hxx>
 #include <tools/list.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <com/sun/star/sheet/XSheetConditionalEntries.hpp>
 #include <com/sun/star/sheet/XSheetCondition.hpp>
 #include <com/sun/star/sheet/XSheetConditionalEntry.hpp>
diff --git a/sc/inc/forbiuno.hxx b/sc/inc/forbiuno.hxx
index eb142b2166a1..305d818a299d 100644
--- a/sc/inc/forbiuno.hxx
+++ b/sc/inc/forbiuno.hxx
@@ -32,7 +32,7 @@
 #define SC_FORBIUNO_HXX
 
 #include <svx/UnoForbiddenCharsTable.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 class ScDocShell;
 
diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx
index 2e5e167bc988..4c45cdb627bc 100644
--- a/sc/inc/funcuno.hxx
+++ b/sc/inc/funcuno.hxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/sheet/XFunctionAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <cppuhelper/implbase3.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 class ScDocument;
 class ScDocOptions;
diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx
index 92c17caf9641..889dc302fcf6 100644
--- a/sc/inc/hints.hxx
+++ b/sc/inc/hints.hxx
@@ -33,7 +33,7 @@
 
 #include "global.hxx"
 #include "address.hxx"
-#include <svtools/hint.hxx>
+#include <svl/hint.hxx>
 
 // ---------------------------------------------------------------------------
 
diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index c45da4f35e27..1a9479dff278 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -31,8 +31,8 @@
 #ifndef SC_LINKUNO_HXX
 #define SC_LINKUNO_HXX
 
-#include <svtools/lstner.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/lstner.hxx>
+#include <svl/itemprop.hxx>
 #include <com/sun/star/sheet/XDDELink.hpp>
 #include <com/sun/star/sheet/XDDELinkResults.hpp>
 #include <com/sun/star/sheet/XDDELinks.hpp>
diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx
index 12b85d54cc49..9261a6db0395 100644
--- a/sc/inc/lookupcache.hxx
+++ b/sc/inc/lookupcache.hxx
@@ -34,7 +34,7 @@
 #include "address.hxx"
 #include "global.hxx"
 #include "formula/token.hxx"
-#include <svtools/listener.hxx>
+#include <svl/listener.hxx>
 #include <tools/string.hxx>
 
 #include <hash_map>
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index bac1dd9711d5..240cead3be83 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_NAMEUNO_HXX
 #define SC_NAMEUNO_HXX
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include "address.hxx"
 #include "formula/grammar.hxx"
 #include <com/sun/star/sheet/XLabelRange.hpp>
diff --git a/sc/inc/notesuno.hxx b/sc/inc/notesuno.hxx
index 3907f3d20967..4cf8148eff17 100644
--- a/sc/inc/notesuno.hxx
+++ b/sc/inc/notesuno.hxx
@@ -32,7 +32,7 @@
 #define SC_NOTESUNO_HXX
 
 #include "address.hxx"
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <com/sun/star/sheet/XSheetAnnotation.hpp>
 #include <com/sun/star/sheet/XSheetAnnotationShapeSupplier.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx
index 86506d7ccdb8..65d350455ddd 100644
--- a/sc/inc/patattr.hxx
+++ b/sc/inc/patattr.hxx
@@ -31,9 +31,9 @@
 #ifndef SC_SCPATATR_HXX
 #define SC_SCPATATR_HXX
 
-#include <svtools/poolitem.hxx>
-#include <svtools/itemset.hxx>
-#include <vcl/fontcvt.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/itemset.hxx>
+#include <unotools/fontcvt.hxx>
 #include <svx/svxenum.hxx>
 #include "scdllapi.h"
 
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index b905bb19db03..dbb86fdf7484 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -152,16 +152,16 @@
 #include <sot/exchange.hxx>
 #include <sot/factory.hxx>
 #include <sot/storage.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/cenumitm.hxx>
-#include <svtools/cintitem.hxx>
-#include <svtools/fltrcfg.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/listener.hxx>
-#include <svtools/lstner.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/solar.hrc>
-#include <svtools/useroptions.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/cenumitm.hxx>
+#include <svl/cintitem.hxx>
+#include <unotools/fltrcfg.hxx>
+#include <svl/intitem.hxx>
+#include <svl/listener.hxx>
+#include <svl/lstner.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/solar.hrc>
+#include <unotools/useroptions.hxx>
 #include <svx/editobj.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/fmglob.hxx>
diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx
index 6c4a88d9df60..0c90ba4497fc 100644
--- a/sc/inc/printopt.hxx
+++ b/sc/inc/printopt.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_PRINTOPT_HXX
 #define SC_PRINTOPT_HXX
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <unotools/configitem.hxx>
 #include "scdllapi.h"
 
@@ -96,6 +96,7 @@ public:
     void            SetOptions( const ScPrintOptions& rNew );
 
     virtual void    Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
 };
 
 #endif
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 375eebe30964..8d3304867f78 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -662,7 +662,9 @@
 //#define SID_OPENDLG_MODCHART      (SC_MESSAGE_START + 58)
 #define SID_OPENDLG_CONDFRMT        (SC_MESSAGE_START + 59)
 #define SID_OPENDLG_OPTSOLVER       (SC_MESSAGE_START + 60)
-
+//<!--Added by PengYunQuan for Validity Cell Range Picker
+#define SID_VALIDITY_REFERENCE      (SC_MESSAGE_START + 61)
+//-->Added by PengYunQuan for Validity Cell Range Picker
 #define SC_HINT_NAVIGATOR_UPDATEALL  (SC_MESSAGE_START + 65)
 
 // Funktionen ------------------------------------------------------------
@@ -1375,6 +1377,8 @@
 
 #define SCSTR_RENAMEOBJECT          (STR_START + 215)
 
+#define SCSTR_PRINT_OPTIONS     (STR_START+216)
+
 // Navigator - in der Reihenfolge wie SC_CONTENT_...
 #define SCSTR_CONTENT_ROOT      (STR_START + 250)
 #define SCSTR_CONTENT_TABLE     (STR_START + 251)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index f9895ff15ebb..94084aab4f1b 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -55,6 +55,9 @@ class SfxStyleSheetBase;
 class ScDPObject;
 struct ScDPFuncData;
 struct ScDPNumGroupInfo;
+//<!--Added by PengYunQuan for Validity Cell Range Picker
+class ScTabViewShell;
+//-->Added by PengYunQuan for Validity Cell Range Picker
 
 namespace com { namespace sun { namespace star { namespace sheet {
     struct DataPilotFieldReference;
@@ -459,8 +462,13 @@ public:
     virtual SfxAbstractTabDialog * CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ,//add for ScParagraphDlg
                                                             int nId ) = 0;
 
+    //<!--Modified by PengYunQuan for Validity Cell Range Picker
+    //virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent, //add for ScValidationDlg
+    //                                              const SfxItemSet* pArgSet,int nId  ) = 0;
+
     virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent, //add for ScValidationDlg
-                                                        const SfxItemSet* pArgSet,int nId  ) = 0;
+                                                        const SfxItemSet* pArgSet,int nId, ScTabViewShell *pTabVwSh  ) = 0;
+    //-->Modified by PengYunQuan for Validity Cell Range Picker
     virtual SfxAbstractTabDialog * CreateScSortDlg( Window*          pParent, //add for ScSortDlg
                                                     const SfxItemSet* pArgSet,int nId ) = 0;
     // for tabpage
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 69f3def3efc5..bf7f8810fec3 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -34,13 +34,19 @@
 #include "scdllapi.h"
 #include "scdll.hxx"
 #include <vcl/timer.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include "global.hxx"       // ScInputMode
 #include "markdata.hxx"     //ScMarkData
 #include "shellids.hxx"
-
+#include <unotools/options.hxx>
 #include <tools/shl.hxx>
 
+//<!--Added by PengYunQuan for Validity Cell Range Picker
+#include <map>
+#include <list>
+#include <algorithm>
+//-->Added by PengYunQuan for Validity Cell Range Picker
+
 
 class KeyEvent;
 class SdrModel;
@@ -113,7 +119,7 @@ struct ScClipData
 //==================================================================
 
 
-class ScModule: public SfxModule, public SfxListener
+class ScModule: public SfxModule, public SfxListener, utl::ConfigurationListener
 {
     Timer               aIdleTimer;
     Timer               aSpellTimer;
@@ -145,6 +151,9 @@ class ScModule: public SfxModule, public SfxListener
     bool                mbIsInSharedDocLoading;
     bool                mbIsInSharedDocSaving;
 
+    //<!--Added by PengYunQuan for Validity Cell Range Picker
+    std::map<USHORT, std::list<Window*> > m_mapRefWindow;
+    //-->Added by PengYunQuan for Validity Cell Range Picker
 public:
                     SFX_DECL_INTERFACE(SCID_APP)
 
@@ -153,6 +162,7 @@ public:
 
     virtual void        FillStatusBar(StatusBar &rBar);
     virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+    virtual void        ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
     void                DeleteCfg();
 
                         // von der Applikation verschoben:
@@ -253,7 +263,10 @@ SC_DLLPUBLIC    void                    SetAppOptions   ( const ScAppOptions& rO
     ScFormEditData*     GetFormEditData()       { return pFormEditData; }
 
     //  Referenzeingabe:
-    void                SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm = NULL );
+    //<!--Added by PengYunQuan for Validity Cell Range Picker
+    //void              SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm = NULL );
+    SC_DLLPUBLIC void               SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm = NULL );
+    //-->Added by PengYunQuan for Validity Cell Range Picker
     BOOL                IsModalMode(SfxObjectShell* pDocSh = NULL);
     BOOL                IsFormulaMode();
     BOOL                IsRefDialogOpen();
@@ -276,6 +289,14 @@ SC_DLLPUBLIC    void                    SetAppOptions   ( const ScAppOptions& rO
     bool                IsInSharedDocLoading() const        { return mbIsInSharedDocLoading; }
     void                SetInSharedDocSaving( bool bNew )   { mbIsInSharedDocSaving = bNew; }
     bool                IsInSharedDocSaving() const         { return mbIsInSharedDocSaving; }
+
+    //<!--Added by PengYunQuan for Validity Cell Range Picker
+    SC_DLLPUBLIC BOOL   RegisterRefWindow( USHORT nSlotId, Window *pWnd );
+    SC_DLLPUBLIC BOOL   UnregisterRefWindow( USHORT nSlotId, Window *pWnd );
+    SC_DLLPUBLIC BOOL   IsAliveRefDlg( USHORT nSlotId, Window *pWnd );
+    SC_DLLPUBLIC Window * Find1RefWindow( USHORT nSlotId, Window *pWndAncestor );
+    SC_DLLPUBLIC Window * Find1RefWindow( Window *pWndAncestor );
+    //-->Added by PengYunQuan for Validity Cell Range Picker
 };
 
 #define SC_MOD() ( *(ScModule**) GetAppData(SHL_CALC) )
diff --git a/sc/inc/srchuno.hxx b/sc/inc/srchuno.hxx
index d486d8b7e298..ffa54cf29d70 100644
--- a/sc/inc/srchuno.hxx
+++ b/sc/inc/srchuno.hxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/util/XReplaceDescriptor.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <cppuhelper/implbase3.hxx>
 
 
diff --git a/sc/inc/stlpool.hxx b/sc/inc/stlpool.hxx
index 1028bb5f7673..ce1d643cd27f 100644
--- a/sc/inc/stlpool.hxx
+++ b/sc/inc/stlpool.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_STLPOOL_HXX
 #define SC_STLPOOL_HXX
 
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 
 
 class ScStyleSheet;
diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx
index 06786dfff69d..ddbbc41b4f80 100644
--- a/sc/inc/stlsheet.hxx
+++ b/sc/inc/stlsheet.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_STLSHEET_HXX
 #define SC_STLSHEET_HXX
 
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 
 //------------------------------------------------------------------------
 
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx
index 5fb28db3239a..34d1b8d3302c 100644
--- a/sc/inc/styleuno.hxx
+++ b/sc/inc/styleuno.hxx
@@ -31,8 +31,8 @@
 #ifndef SC_STYLEUNO_HXX
 #define SC_STYLEUNO_HXX
 
-#include <svtools/itemprop.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/itemprop.hxx>
+#include <svl/lstner.hxx>
 #include <rsc/rscsfx.hxx>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/style/XStyle.hpp>
diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx
index 3dc549656fa1..db8670521c25 100644
--- a/sc/inc/targuno.hxx
+++ b/sc/inc/targuno.hxx
@@ -31,7 +31,7 @@
 #ifndef SC_TARGUNO_HXX
 #define SC_TARGUNO_HXX
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <tools/string.hxx>
 #include <com/sun/star/document/XLinkTargetSupplier.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx
index 8ec7707874be..64eb2aaba696 100644
--- a/sc/inc/textuno.hxx
+++ b/sc/inc/textuno.hxx
@@ -34,8 +34,8 @@
 #include "global.hxx"           // ScRange, ScAddress
 #include "address.hxx"
 #include <svx/unotext.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
 #include <com/sun/star/text/XTextFieldsSupplier.hpp>
 #include <com/sun/star/sheet/XHeaderFooterContent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx
index bcd3435668be..0c573c6961c1 100644
--- a/sc/inc/tokenuno.hxx
+++ b/sc/inc/tokenuno.hxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/sheet/FormulaToken.hpp>
 #include <com/sun/star/sheet/XFormulaParser.hpp>
 #include <cppuhelper/implbase3.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <formula/FormulaOpCodeMapperObj.hxx>
 #include "address.hxx"
 #include "compiler.hxx"
diff --git a/sc/inc/unoreflist.hxx b/sc/inc/unoreflist.hxx
index 42486071adef..08223d546c57 100644
--- a/sc/inc/unoreflist.hxx
+++ b/sc/inc/unoreflist.hxx
@@ -32,7 +32,7 @@
 #define SC_UNOREFLIST_HXX
 
 #include <list>
-#include <svtools/hint.hxx>
+#include <svl/hint.hxx>
 #include "rangelst.hxx"
 
 
diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx
index e489cb718163..045ca7aac598 100644
--- a/sc/inc/viewuno.hxx
+++ b/sc/inc/viewuno.hxx
@@ -32,8 +32,8 @@
 #define SC_VIEWUNO_HXX
 
 #include <sfx2/sfxbasecontroller.hxx>
-#include <svtools/svarray.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/svarray.hxx>
+#include <svl/itemprop.hxx>
 #include <com/sun/star/view/XFormLayerAccess.hpp>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
@@ -96,13 +96,14 @@ private:
     USHORT                  nPane;          // ScSplitPos oder SC_VIEWPANE_ACTIVE
 
 protected:
-    ScTabViewShell*         GetViewShell() const    { return pViewShell; }
     ::com::sun::star::awt::Rectangle GetVisArea() const;
 
 public:
                             ScViewPaneBase(ScTabViewShell* pViewSh, USHORT nP);
     virtual                 ~ScViewPaneBase();
 
+    ScTabViewShell*         GetViewShell() const    { return pViewShell; }
+
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
                                 const ::com::sun::star::uno::Type & rType )
                                     throw(::com::sun::star::uno::RuntimeException);
@@ -124,7 +125,7 @@ public:
                             getReferredCells() throw(::com::sun::star::uno::RuntimeException);
 
                             // XFormLayerAccess
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > SAL_CALL
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL
                             getFormController( const ::com::sun::star::uno::Reference<
                                 ::com::sun::star::form::XForm >& Form )
                                     throw (::com::sun::star::uno::RuntimeException);