diff options
author | Tor Lillqvist <tml@collabora.com> | 2019-01-18 14:14:37 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2019-01-21 11:27:29 +0200 |
commit | de0105a3093beca09830188623c9c54c8095b2c6 (patch) | |
tree | e8cf8272727e4c0b84860b8b79361832b12641a4 /sw | |
parent | c4ac33d5cee521fa24a9d46f53d1c6e9c9650086 (diff) |
Add Documents.OpenOld() method and Application.CustomizationContext property
OpenOld() just forwards to the regular Open(), passing empty extra
parameters. CustomizationContext is fully dummy for now.
Change-Id: I167494700853768d971fe16afea35e90a647a00e
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/ui/vba/vbaapplication.cxx | 11 | ||||
-rw-r--r-- | sw/source/ui/vba/vbaapplication.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/vba/vbadocuments.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/vba/vbadocuments.hxx | 1 |
4 files changed, 20 insertions, 0 deletions
diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx index 578a2b3d6c35..b9c8bd5f4055 100644 --- a/sw/source/ui/vba/vbaapplication.cxx +++ b/sw/source/ui/vba/vbaapplication.cxx @@ -319,6 +319,17 @@ OUString SAL_CALL SwVbaApplication::getStatusBar() return OUString(""); } +uno::Any SAL_CALL SwVbaApplication::getCustomizationContext() +{ + return uno::Any(); // ??? +} + +void SAL_CALL SwVbaApplication::setCustomizationContext( const uno::Any& _customizationcontext ) +{ + (void) _customizationcontext; + // ??? +} + void SAL_CALL SwVbaApplication::setStatusBar( const OUString& _statusbar ) { // ScVbaAppSettings::setStatusBar() also uses the XStatusIndicator to show this, so maybe that is OK? diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx index 96b4be10100f..b32a372749cd 100644 --- a/sw/source/ui/vba/vbaapplication.hxx +++ b/sw/source/ui/vba/vbaapplication.hxx @@ -89,6 +89,8 @@ public: virtual void SAL_CALL setTop( sal_Int32 _top ) override; virtual OUString SAL_CALL getStatusBar() override; virtual void SAL_CALL setStatusBar( const OUString& _statusbar ) override; + virtual css::uno::Any SAL_CALL getCustomizationContext() override; + virtual void SAL_CALL setCustomizationContext( const css::uno::Any& _customizationcontext ) override; virtual float SAL_CALL CentimetersToPoints( float Centimeters ) override; virtual void SAL_CALL ShowMe() override; virtual void SAL_CALL Resize( sal_Int32 Width, sal_Int32 Height ) override; diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx index 4424a890cdfd..980406c88d23 100644 --- a/sw/source/ui/vba/vbadocuments.cxx +++ b/sw/source/ui/vba/vbadocuments.cxx @@ -141,6 +141,12 @@ SwVbaDocuments::OpenNoRepairDialog( const OUString& Filename, const uno::Any& Co return Open( Filename, ConfirmConversions, ReadOnly, AddToRecentFiles, PasswordDocument, PasswordTemplate, Revert, WritePasswordDocument, WritePasswordTemplate, Format, Encoding, Visible, OpenAndRepair, DocumentDirection, NoEncodingDialog, XMLTransform ); } +uno::Any SAL_CALL +SwVbaDocuments::OpenOld( const OUString& FileName, const uno::Any& ConfirmConversions, const uno::Any& ReadOnly, const uno::Any& AddToRecentFiles, const uno::Any& PasswordDocument, const uno::Any& PasswordTemplate, const uno::Any& Revert, const uno::Any& WritePasswordDocument, const uno::Any& WritePasswordTemplate, const uno::Any& Format ) +{ + return Open( FileName, ConfirmConversions, ReadOnly, AddToRecentFiles, PasswordDocument, PasswordTemplate, Revert, WritePasswordDocument, WritePasswordTemplate, Format, uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any() ); +} + OUString SwVbaDocuments::getServiceImplName() { diff --git a/sw/source/ui/vba/vbadocuments.hxx b/sw/source/ui/vba/vbadocuments.hxx index 45dcfab61b88..d72b1a168486 100644 --- a/sw/source/ui/vba/vbadocuments.hxx +++ b/sw/source/ui/vba/vbadocuments.hxx @@ -46,6 +46,7 @@ public: virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template, const css::uno::Any& NewTemplate, const css::uno::Any& DocumentType, const css::uno::Any& Visible ) override; virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) override; virtual css::uno::Any SAL_CALL OpenNoRepairDialog( const OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) override; + virtual css::uno::Any SAL_CALL OpenOld( const OUString& FileName, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format ) override; virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& OriginalFormat, const css::uno::Any& RouteDocument ) override; }; |