oovbaapi/ooo/vba/excel/XPageSetup.idl | 3 +++ sc/inc/cellsuno.hxx | 2 +- sc/source/ui/unoobj/cellsuno.cxx | 11 +++++++++++ sc/source/ui/vba/vbapagesetup.cxx | 29 ++++++++++++++++++++++++++--- sc/source/ui/vba/vbapagesetup.hxx | 6 ++++++ 5 files changed, 47 insertions(+), 4 deletions(-)
New commits: commit 5a3a87d33c43a76401522a3348b4a6979cbc4c00 Author: Noel Power <[email protected]> Date: Fri Apr 5 16:53:23 2013 +0100 fix Worksheet.Cells by now allowing TableSheet range to change from updates Change-Id: I19cd39ec58b778f4634258352676da7e04822b65 (cherry picked from commit 70aff4a7f7abe0c768238733ca8900b746e60189) diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index 3585c89..926589c 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -1025,7 +1025,7 @@ protected: public: ScTableSheetObj(ScDocShell* pDocSh, SCTAB nTab); virtual ~ScTableSheetObj(); - + virtual void RefChanged(); void InitInsertSheet(ScDocShell* pDocSh, SCTAB nTab); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 922ed13..fcfe7e9 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -6931,6 +6931,17 @@ ScTableSheetObj::~ScTableSheetObj() { } +void ScTableSheetObj::RefChanged() +{ + // skip calling immediate base + // class ScCellRangeObj::RefChanged as + // it changes the Sheets range ( which shouldn't + // happen ) - hmm maybe we don't even need to + // call ScCellRangesBase::RefChanged() :/ + + ScCellRangesBase::RefChanged(); +} + void ScTableSheetObj::InitInsertSheet(ScDocShell* pDocSh, SCTAB nTab) { InitInsertRange( pDocSh, ScRange(0,0,nTab, MAXCOL,MAXROW,nTab) ); commit bc5c14b2930aee05929ed525798a2704248f4ef6 Author: Noel Power <[email protected]> Date: Mon Apr 15 15:12:39 2013 +0100 bnc#813528 stub out some missing XPageSetup api (cherry picked from commit 7b542db859221cae585df458fd9f330d4b11d142) Change-Id: I105ca73f9f99013c4472ae2d7491fbc67e435015 diff --git a/oovbaapi/ooo/vba/excel/XPageSetup.idl b/oovbaapi/ooo/vba/excel/XPageSetup.idl index d4ec10b..c83f2f1 100644 --- a/oovbaapi/ooo/vba/excel/XPageSetup.idl +++ b/oovbaapi/ooo/vba/excel/XPageSetup.idl @@ -50,6 +50,9 @@ interface XPageSetup : com::sun::star::uno::XInterface [attribute] boolean CenterVertically; [attribute] boolean CenterHorizontally; [attribute] boolean PrintHeadings; + [attribute] boolean PrintGridlines; + [attribute] string PrintTitleRows; + [attribute] string PrintTitleColumns; }; diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx index f39db81..72e260a 100644 --- a/sc/source/ui/vba/vbapagesetup.cxx +++ b/sc/source/ui/vba/vbapagesetup.cxx @@ -598,7 +598,32 @@ void SAL_CALL ScVbaPageSetup::setPrintHeadings( sal_Bool printHeadings) throw (c } } -rtl::OUString +::sal_Bool SAL_CALL ScVbaPageSetup::getPrintGridlines() throw (uno::RuntimeException) +{ + return sal_False; +} + +void SAL_CALL ScVbaPageSetup::setPrintGridlines( ::sal_Bool /*_printgridlines*/ ) throw (uno::RuntimeException) +{ +} + +OUString SAL_CALL ScVbaPageSetup::getPrintTitleRows() throw (uno::RuntimeException) +{ + return OUString(); +} +void SAL_CALL ScVbaPageSetup::setPrintTitleRows( const OUString& /*_printtitlerows*/ ) throw (css::uno::RuntimeException) +{ +} +OUString SAL_CALL ScVbaPageSetup::getPrintTitleColumns() throw (uno::RuntimeException) +{ + return OUString(); +} + +void SAL_CALL ScVbaPageSetup::setPrintTitleColumns( const OUString& /*_printtitlecolumns*/ ) throw (uno::RuntimeException) +{ +} + +OUString ScVbaPageSetup::getServiceImplName() { return rtl::OUString("ScVbaPageSetup"); diff --git a/sc/source/ui/vba/vbapagesetup.hxx b/sc/source/ui/vba/vbapagesetup.hxx index 38ca461..9431c75 100644 --- a/sc/source/ui/vba/vbapagesetup.hxx +++ b/sc/source/ui/vba/vbapagesetup.hxx @@ -75,6 +75,12 @@ public: virtual sal_Bool SAL_CALL getPrintHeadings() throw (css::uno::RuntimeException); virtual void SAL_CALL setPrintHeadings( sal_Bool printHeadings ) throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL getPrintGridlines() throw (css::uno::RuntimeException); + virtual void SAL_CALL setPrintGridlines( ::sal_Bool _printgridlines ) throw (css::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getPrintTitleRows() throw (css::uno::RuntimeException); + virtual void SAL_CALL setPrintTitleRows( const ::rtl::OUString& _printtitlerows ) throw (css::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getPrintTitleColumns() throw (css::uno::RuntimeException); + virtual void SAL_CALL setPrintTitleColumns( const ::rtl::OUString& _printtitlecolumns ) throw (css::uno::RuntimeException); // XHelperInterface virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); commit b8541c55cf930a11164417be7e4aee5c1fb31f91 Author: Noel Power <[email protected]> Date: Wed Apr 24 10:13:53 2013 +0100 follow fix for bnc#813528 Change-Id: Id6c9cd01bc68e13b87c845d9272c7b85756987c5 (cherry picked from commit 06732f0437ee4c8eb0c90f60156f0c0f57960757) diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx index 4df0b92..f39db81 100644 --- a/sc/source/ui/vba/vbapagesetup.cxx +++ b/sc/source/ui/vba/vbapagesetup.cxx @@ -509,8 +509,6 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getFirstPageNumber() throw (css::uno::Runtime void SAL_CALL ScVbaPageSetup::setFirstPageNumber( sal_Int32 firstPageNumber) throw (css::uno::RuntimeException) { - if( firstPageNumber < 0 ) - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); if( firstPageNumber == excel::Constants::xlAutomatic ) firstPageNumber = 0; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
