summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2022-12-06 15:46:20 +0000
committerCaolán McNamara <caolanm@redhat.com>2022-12-06 19:30:12 +0000
commit1710de70aa6d6522e009b7ac00b1fa5dfe4d7705 (patch)
treef3dfb223cdb6b5542d1046474fc35f459a7d1fc3 /sdext
parent353ede41b97729a98ac090f89889a055051db98c (diff)
InformationDialog is a misleading name
It's not the Minimizer dialog, it's the document frame that the dialog is associated with. Change-Id: Ifb7de8dc3fa5ffa5180dab17f9b327fe7296dd0f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143738 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/minimizer/impoptimizer.cxx8
-rw-r--r--sdext/source/minimizer/impoptimizer.hxx2
-rw-r--r--sdext/source/minimizer/optimizerdialog.cxx2
-rw-r--r--sdext/source/minimizer/pppoptimizertoken.cxx2
-rw-r--r--sdext/source/minimizer/pppoptimizertoken.hxx2
5 files changed, 8 insertions, 8 deletions
diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx
index 7de159177979..721d7ef51bfe 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -569,7 +569,7 @@ void ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
switch( TKGet( rArgument.Name ) )
{
case TK_StatusDispatcher : rArgument.Value >>= mxStatusDispatcher; break;
- case TK_InformationDialog: rArgument.Value >>= mxInformationDialog; break;
+ case TK_DocumentFrame: rArgument.Value >>= mxDocumentFrame; break;
case TK_Settings :
{
css::uno::Sequence< css::beans::PropertyValue > aSettings;
@@ -655,7 +655,7 @@ void ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
mxModel->unlockControllers();
// clearing undo stack:
- Reference< XFrame > xFrame( xSelf.is() ? xSelf : mxInformationDialog );
+ Reference< XFrame > xFrame( xSelf.is() ? xSelf : mxDocumentFrame );
if ( xFrame.is() )
{
DispatchURL(mxContext, ".uno:ClearUndoStack", xFrame);
@@ -671,9 +671,9 @@ void ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
}
}
- if ( mxInformationDialog.is() )
+ if ( mxDocumentFrame.is() )
{
- InformationDialog aInformationDialog( mxContext, mxInformationDialog, maSaveAsURL, mbOpenNewDocument, nSourceSize, nDestSize, nEstimatedFileSize );
+ InformationDialog aInformationDialog( mxContext, mxDocumentFrame, maSaveAsURL, mbOpenNewDocument, nSourceSize, nDestSize, nEstimatedFileSize );
aInformationDialog.execute();
SetStatusValue( TK_OpenNewDocument, Any( mbOpenNewDocument ) );
DispatchStatus();
diff --git a/sdext/source/minimizer/impoptimizer.hxx b/sdext/source/minimizer/impoptimizer.hxx
index 6a52e94986a4..a7436f7cec92 100644
--- a/sdext/source/minimizer/impoptimizer.hxx
+++ b/sdext/source/minimizer/impoptimizer.hxx
@@ -51,7 +51,7 @@ private:
OUString maFilterName;
bool mbOpenNewDocument;
- css::uno::Reference< css::frame::XFrame > mxInformationDialog;
+ css::uno::Reference< css::frame::XFrame > mxDocumentFrame;
void Optimize();
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx
index 4b7e6f039988..2ab84a59c455 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -586,7 +586,7 @@ bool OptimizerDialog::onFinish()
Sequence< PropertyValue > lArguments{
comphelper::makePropertyValue("Settings", GetConfigurationSequence()),
comphelper::makePropertyValue("StatusDispatcher", GetStatusDispatcher()),
- comphelper::makePropertyValue("InformationDialog", GetFrame())
+ comphelper::makePropertyValue("DocumentFrame", GetFrame())
};
ErrCode errorCode;
diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx b/sdext/source/minimizer/pppoptimizertoken.cxx
index 6062efa44f14..e933bf1e967c 100644
--- a/sdext/source/minimizer/pppoptimizertoken.cxx
+++ b/sdext/source/minimizer/pppoptimizertoken.cxx
@@ -52,7 +52,7 @@ const TokenTable pTokenTableArray[] =
{ "FileSizeSource", TK_FileSizeSource },
{ "FilterName", TK_FilterName },
{ "Flags", TK_Flags },
- { "InformationDialog", TK_InformationDialog },
+ { "DocumentFrame", TK_DocumentFrame },
{ "Name", TK_Name },
{ "Progress", TK_Progress },
{ "Settings", TK_Settings },
diff --git a/sdext/source/minimizer/pppoptimizertoken.hxx b/sdext/source/minimizer/pppoptimizertoken.hxx
index 4f74e73319d6..62b1b369045a 100644
--- a/sdext/source/minimizer/pppoptimizertoken.hxx
+++ b/sdext/source/minimizer/pppoptimizertoken.hxx
@@ -31,7 +31,7 @@ enum PPPOptimizerTokenEnum
TK_FileSizeSource,
TK_FilterName,
TK_Flags,
- TK_InformationDialog,
+ TK_DocumentFrame,
TK_Name,
TK_Progress,
TK_Settings,