summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2021-11-19 14:17:33 +0100
committerStephan Bergmann <sbergman@redhat.com>2021-11-19 15:33:10 +0100
commit168ae4c00a86b7534dedd303f9ef008e19822b99 (patch)
tree60e71daf9279f19f98bc756638743fe4b5a1a09f
parenta8beb8c08886ac6eef7fcc6a8881a77156e05d4e (diff)
Fix --enable-online-update
...after 4bc44490f51f7cc4a36cc7131137018da986c293 "loplugin:stringliteraldefine in tools" Change-Id: I0ec1e07b151e853be8a795c7135aecf5c6957eac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125556 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--extensions/source/update/check/updatehdl.cxx20
1 files changed, 10 insertions, 10 deletions
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index 74f7b857828c..b0ecb69e37f9 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -142,7 +142,7 @@ void UpdateHandler::setDownloadBtnLabel( bool bAppendDots )
aLabel += "...";
setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], "Label", uno::Any( aLabel ) );
- setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_DOWNLOAD2 ) );
+ setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME + HID_CHECK_FOR_UPD_DOWNLOAD2 ) );
mbDownloadBtnHasDots = bAppendDots;
}
@@ -1032,7 +1032,7 @@ void UpdateHandler::createDialog()
xPropSet->setPropertyValue( "PositionY", uno::Any(sal_Int32( 100 )) );
xPropSet->setPropertyValue( "Width", uno::Any(sal_Int32( DIALOG_WIDTH )) );
xPropSet->setPropertyValue( "Height", uno::Any(sal_Int32( DIALOG_HEIGHT )) );
- xPropSet->setPropertyValue( "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_DLG ) );
+ xPropSet->setPropertyValue( "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME + HID_CHECK_FOR_UPD_DLG ) );
}
{ // Label (fixed text) <status>
uno::Sequence< beans::NamedValue > aProps { { "Label", uno::Any( msStatusFL ) } };
@@ -1057,7 +1057,7 @@ void UpdateHandler::createDialog()
{ "MultiLine", uno::Any( true ) },
{ "ReadOnly", uno::Any( true ) },
{ "AutoVScroll", uno::Any( true ) },
- { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_STATUS ) }
+ { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME + HID_CHECK_FOR_UPD_STATUS ) }
};
insertControlModel( xControlModel, EDIT_FIELD_MODEL, TEXT_STATUS,
@@ -1090,7 +1090,7 @@ void UpdateHandler::createDialog()
{ "Enabled", uno::Any( true ) },
{ "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) },
{ "Label", uno::Any( msPauseBtn ) },
- { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_PAUSE ) }
+ { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME + HID_CHECK_FOR_UPD_PAUSE ) }
};
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[PAUSE_BUTTON],
@@ -1104,7 +1104,7 @@ void UpdateHandler::createDialog()
{ "Enabled", uno::Any( true ) },
{ "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) },
{ "Label", uno::Any( msResumeBtn ) },
- { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_RESUME ) }
+ { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME + HID_CHECK_FOR_UPD_RESUME ) }
};
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[RESUME_BUTTON],
@@ -1121,7 +1121,7 @@ void UpdateHandler::createDialog()
{ "Enabled", uno::Any( true ) },
{ "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) },
{ "Label", uno::Any( msCancelBtn ) },
- { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_CANCEL ) }
+ { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME + HID_CHECK_FOR_UPD_CANCEL ) }
};
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[CANCEL_BUTTON],
@@ -1154,7 +1154,7 @@ void UpdateHandler::createDialog()
{ "MultiLine", uno::Any( true ) },
{ "ReadOnly", uno::Any( true ) },
{ "AutoVScroll", uno::Any( true ) },
- { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_DESCRIPTION ) }
+ { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME + HID_CHECK_FOR_UPD_DESCRIPTION ) }
};
insertControlModel( xControlModel, EDIT_FIELD_MODEL, TEXT_DESCRIPTION,
@@ -1183,7 +1183,7 @@ void UpdateHandler::createDialog()
// setProperty( aProps, 2, "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_CANCEL) ) );
// [property] string Label // only if PushButtonType_STANDARD
{ "Label", uno::Any( msClose ) },
- { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_CLOSE ) }
+ { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME + HID_CHECK_FOR_UPD_CLOSE ) }
};
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[ CLOSE_BUTTON ],
@@ -1197,7 +1197,7 @@ void UpdateHandler::createDialog()
{ "Enabled", uno::Any( true ) },
{ "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) },
{ "Label", uno::Any( msInstall ) },
- { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_INSTALL ) }
+ { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME + HID_CHECK_FOR_UPD_INSTALL ) }
};
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[INSTALL_BUTTON],
@@ -1211,7 +1211,7 @@ void UpdateHandler::createDialog()
{ "Enabled", uno::Any( true ) },
{ "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) },
{ "Label", uno::Any( msDownload ) },
- { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_DOWNLOAD ) }
+ { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME + HID_CHECK_FOR_UPD_DOWNLOAD ) }
};
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[DOWNLOAD_BUTTON],