diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-06 09:37:44 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-06 09:37:44 +0100 |
commit | b183742d3f8cb0edc59d4a60132ca0036d3f41c9 (patch) | |
tree | 6fe4f97687870071aad2f6e77dde38ba56217c0b /svtools | |
parent | 12083a480c35a3a2c3362a51d72b9a421c021a2a (diff) |
loplugin:stringconstant: elide explicit ctor usage (automatic rewrite)
Change-Id: I3da35c56d042b11cda04a94667923d6089c921a8
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/config/colorcfg.cxx | 2 | ||||
-rw-r--r-- | svtools/source/config/extcolorcfg.cxx | 4 | ||||
-rw-r--r-- | svtools/source/contnr/DocumentInfoPreview.cxx | 2 | ||||
-rw-r--r-- | svtools/source/contnr/fileview.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/ctrlbox.cxx | 6 | ||||
-rw-r--r-- | svtools/source/control/ctrltool.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/roadmap.cxx | 6 | ||||
-rw-r--r-- | svtools/source/control/ruler.cxx | 2 | ||||
-rw-r--r-- | svtools/source/dialogs/addresstemplate.cxx | 4 | ||||
-rw-r--r-- | svtools/source/filter/exportdialog.cxx | 82 | ||||
-rw-r--r-- | svtools/source/uno/addrtempuno.cxx | 2 | ||||
-rw-r--r-- | svtools/source/uno/genericunodialog.cxx | 4 | ||||
-rw-r--r-- | svtools/source/uno/toolboxcontroller.cxx | 4 |
13 files changed, 61 insertions, 61 deletions
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index a7d9ce3e2e3b..ef3c698df375 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -247,7 +247,7 @@ void ColorConfig_Impl::Load(const OUString& rScheme) } // fdo#71511: check if we are running in a11y autodetect { - utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithComponentContext(comphelper::getProcessComponentContext(),OUString("org.openoffice.Office.Common/Accessibility") ); + utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithComponentContext(comphelper::getProcessComponentContext(),"org.openoffice.Office.Common/Accessibility" ); if(aNode.isValid()) { uno::Any aValue = aNode.getNodeValue(OUString("AutoDetectSystemHC")); diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index d31dd7ca2aea..a2fa5ec37eb6 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -494,7 +494,7 @@ void ExtendedColorConfig_Impl::SetColorConfigValue(const OUString& _sName, const bool ExtendedColorConfig_Impl::AddScheme(const OUString& rScheme) { - if(ConfigItem::AddNode(OUString("ExtendedColorScheme/ColorSchemes"), rScheme)) + if(ConfigItem::AddNode("ExtendedColorScheme/ColorSchemes", rScheme)) { m_sLoadedScheme = rScheme; Commit(); @@ -507,7 +507,7 @@ bool ExtendedColorConfig_Impl::RemoveScheme(const OUString& rScheme) { uno::Sequence< OUString > aElements(1); aElements.getArray()[0] = rScheme; - return ClearNodeElements(OUString("ExtendedColorScheme/ColorSchemes"), aElements); + return ClearNodeElements("ExtendedColorScheme/ColorSchemes", aElements); } void ExtendedColorConfig_Impl::SettingsChanged() diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx index b49e17c116ae..7e3bba1fa94f 100644 --- a/svtools/source/contnr/DocumentInfoPreview.cxx +++ b/svtools/source/contnr/DocumentInfoPreview.cxx @@ -143,7 +143,7 @@ void ODocumentInfoPreview::insertEntry( OUString const & title, OUString const & value) { if (!m_pEditWin->GetText().isEmpty()) { - m_pEditWin->InsertText(OUString("\n\n")); + m_pEditWin->InsertText("\n\n"); } OUString caption(title + ":\n"); m_pEditWin->InsertText(caption); diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 8ae8b16dc467..9fadd0bc3537 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -946,7 +946,7 @@ bool ViewTabListBox_Impl::Kill( const OUString& rContent ) try { ::ucbhelper::Content aCnt( rContent, mxCmdEnv, comphelper::getProcessComponentContext() ); - aCnt.executeCommand( OUString( "delete" ), makeAny( true ) ); + aCnt.executeCommand( "delete", makeAny( true ) ); } catch( css::ucb::CommandAbortedException const & ) { diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 6f937eb83528..9b52255e0ca7 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -651,7 +651,7 @@ void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance, //this calculation and draw a bitmap of height //equal to normal text line and center the //line within that - long nMinWidth = GetTextWidth(OUString("----------")); + long nMinWidth = GetTextWidth("----------"); Size aSize = CalcSubEditSize(); aSize.Width() = std::max(nMinWidth, aSize.Width()); aSize.Width() -= aTxtSize.Width(); @@ -710,7 +710,7 @@ void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance, void LineListBox::ImplInit() { - aTxtSize.Width() = GetTextWidth( OUString( " " ) ); + aTxtSize.Width() = GetTextWidth( " " ); aTxtSize.Height() = GetTextHeight(); pLineList = new ImpLineList(); eUnit = FUNIT_POINT; @@ -871,7 +871,7 @@ void LineListBox::UpdateEntries( long nOldWidth ) GetColorLine2( GetEntryCount( ) ), GetColorDist( GetEntryCount( ) ), pData->GetStyle(), aBmp ); - ListBox::InsertEntry(OUString(" "), Image(aBmp)); + ListBox::InsertEntry(" ", Image(aBmp)); if ( n == nTypePos ) SelectEntryPos( GetEntryCount() - 1 ); } diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index 50a304c266c5..ef263e7ea607 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -567,7 +567,7 @@ namespace //If this is a known but uninstalled symbol font which we can remap to //OpenSymbol then toggle its charset to be a symbol font - if (ConvertChar::GetRecodeData(rName, OUString("OpenSymbol"))) + if (ConvertChar::GetRecodeData(rName, "OpenSymbol")) aInfo.SetCharSet(RTL_TEXTENCODING_SYMBOL); return aInfo; diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index 873f3874fe49..9201731ebb20 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -334,7 +334,7 @@ void ORoadmap::SetRoadmapComplete(bool _bComplete) } } else if (bWasComplete) - m_pImpl->InCompleteHyperLabel = InsertHyperLabel(m_pImpl->getItemCount(), OUString("..."), -1, true/*bEnabled*/, true/*bIncomplete*/ ); + m_pImpl->InCompleteHyperLabel = InsertHyperLabel(m_pImpl->getItemCount(), "...", -1, true/*bEnabled*/, true/*bIncomplete*/ ); } void ORoadmap::UpdatefollowingHyperLabels(ItemIndex _nIndex) @@ -357,7 +357,7 @@ void ORoadmap::UpdatefollowingHyperLabels(ItemIndex _nIndex) { RoadmapItem* pOldItem = GetPreviousHyperLabel( m_pImpl->getItemCount() ); m_pImpl->InCompleteHyperLabel->SetPosition( pOldItem ); - m_pImpl->InCompleteHyperLabel->Update( m_pImpl->getItemCount(), OUString("...") ); + m_pImpl->InCompleteHyperLabel->Update( m_pImpl->getItemCount(), "..." ); } } @@ -788,7 +788,7 @@ void RoadmapItem::ImplUpdatePosSize() { // calculate widths long nIDWidth = mpID->GetTextWidth( mpID->GetText() ); - long nMaxIDWidth = mpID->GetTextWidth( OUString( "100." ) ); + long nMaxIDWidth = mpID->GetTextWidth( "100." ); nIDWidth = ::std::min( nIDWidth, nMaxIDWidth ); // check how many space the description would need diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 7a6eeefbfb66..40328b708fae 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -273,7 +273,7 @@ void Ruler::ImplInit( WinBits nWinBits ) // Setup the default size Rectangle aRect; - GetTextBoundRect( aRect, OUString( "0123456789" ) ); + GetTextBoundRect( aRect, "0123456789" ); long nDefHeight = aRect.GetHeight() + RULER_OFF * 2 + ruler_tab.textoff * 2 + mnBorderWidth; Size aDefSize; diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 1a3bb0fe30ca..9c6da2def304 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -295,7 +295,7 @@ void AssignmentPersistentData::ImplCommit() AssignmentPersistentData::AssignmentPersistentData() :ConfigItem( OUString( "Office.DataAccess/AddressBook" )) { - Sequence< OUString > aStoredNames = GetNodeNames(OUString("Fields")); + Sequence< OUString > aStoredNames = GetNodeNames("Fields"); const OUString* pStoredNames = aStoredNames.getConstArray(); for (sal_Int32 i=0; i<aStoredNames.getLength(); ++i, ++pStoredNames) m_aStoredFields.insert(*pStoredNames); @@ -1182,7 +1182,7 @@ void AssignmentPersistentData::ImplCommit() catch(const Exception&) { } if (!xAdminDialog.is()) { - ShowServiceNotAvailableError(this, OUString("com.sun.star.ui.dialogs.AddressBookSourcePilot"), true); + ShowServiceNotAvailableError(this, "com.sun.star.ui.dialogs.AddressBookSourcePilot", true); return; } diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index 74a2f39ffd1f..930684f86eae 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -192,16 +192,16 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( bool bUpdateC if ( nResolution < 1 ) nResolution = 96; - mpOptionsItem->WriteInt32(OUString("PixelExportUnit"), nUnit); - mpOptionsItem->WriteInt32(OUString("PixelExportResolution"), nResolution); - mpOptionsItem->WriteInt32(OUString("PixelExportResolutionUnit"), mpLbResolution->GetSelectEntryPos()); + mpOptionsItem->WriteInt32("PixelExportUnit", nUnit); + mpOptionsItem->WriteInt32("PixelExportResolution", nResolution); + mpOptionsItem->WriteInt32("PixelExportResolutionUnit", mpLbResolution->GetSelectEntryPos()); } else { if ( nUnit >= UNIT_PIXEL ) nUnit = UNIT_CM; - mpOptionsItem->WriteInt32(OUString("VectorExportUnit"), nUnit); + mpOptionsItem->WriteInt32("VectorExportUnit", nUnit); } } @@ -218,8 +218,8 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( bool bUpdateC const OUString sLogicalHeight("LogicalHeight"); if ( mbIsPixelFormat ) { - pFilterOptions->WriteInt32(OUString("PixelWidth"), static_cast< sal_Int32 >( maSize.Width ) ); - pFilterOptions->WriteInt32(OUString("PixelHeight"), static_cast< sal_Int32 >( maSize.Height ) ); + pFilterOptions->WriteInt32("PixelWidth", static_cast< sal_Int32 >( maSize.Width ) ); + pFilterOptions->WriteInt32("PixelHeight", static_cast< sal_Int32 >( maSize.Height ) ); if ( maResolution.Width && maResolution.Height ) { const double f100thmmPerPixelX = 100000.0 / maResolution.Width; @@ -247,29 +247,29 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( bool bUpdateC nColor = 0; else nColor = 1; - pFilterOptions->WriteInt32(OUString("ColorMode"), nColor); - pFilterOptions->WriteInt32(OUString("Quality"), static_cast<sal_Int32>(mpSbCompression->GetThumbPos())); + pFilterOptions->WriteInt32("ColorMode", nColor); + pFilterOptions->WriteInt32("Quality", static_cast<sal_Int32>(mpSbCompression->GetThumbPos())); } break; case FORMAT_PNG : { - pFilterOptions->WriteInt32(OUString("Compression"), static_cast<sal_Int32>(mpSbCompression->GetThumbPos())); + pFilterOptions->WriteInt32("Compression", static_cast<sal_Int32>(mpSbCompression->GetThumbPos())); sal_Int32 nInterlace = 0; if ( mpCbInterlaced->IsChecked() ) nInterlace++; - pFilterOptions->WriteInt32(OUString("Interlaced"), nInterlace); + pFilterOptions->WriteInt32("Interlaced", nInterlace); sal_Int32 nValue = 0; if ( mpCbSaveTransparency->IsChecked() ) nValue++; - pFilterOptions->WriteInt32(OUString("Translucent"), nValue); + pFilterOptions->WriteInt32("Translucent", nValue); } break; case FORMAT_BMP : { - pFilterOptions->WriteInt32(OUString("Color"), mpLbColorDepth->GetSelectEntryPos() + 1); - pFilterOptions->WriteBool(OUString("RLE_Coding"), mpCbRLEEncoding->IsChecked()); + pFilterOptions->WriteInt32("Color", mpLbColorDepth->GetSelectEntryPos() + 1); + pFilterOptions->WriteBool("RLE_Coding", mpCbRLEEncoding->IsChecked()); } break; @@ -278,12 +278,12 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( bool bUpdateC sal_Int32 nValue = 0; if ( mpCbInterlaced->IsChecked() ) nValue++; - pFilterOptions->WriteInt32(OUString("Interlaced"), nValue); + pFilterOptions->WriteInt32("Interlaced", nValue); nValue = 0; if (mpCbSaveTransparency->IsChecked()) nValue++; - pFilterOptions->WriteInt32(OUString("Translucent"), nValue); + pFilterOptions->WriteInt32("Translucent", nValue); } break; @@ -294,7 +294,7 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( bool bUpdateC sal_Int32 nFormat = 0; if ( mpRbText->IsChecked() ) nFormat++; - pFilterOptions->WriteInt32(OUString("FileFormat"), nFormat); + pFilterOptions->WriteInt32("FileFormat", nFormat); } break; @@ -305,22 +305,22 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( bool bUpdateC nCheck++; if ( mpCbEPSPreviewEPSI->IsChecked() ) nCheck += 2; - pFilterOptions->WriteInt32(OUString("Preview"), nCheck); + pFilterOptions->WriteInt32("Preview", nCheck); nCheck = 1; if ( mpRbEPSLevel2->IsChecked() ) nCheck++; - pFilterOptions->WriteInt32(OUString("Version"), nCheck); + pFilterOptions->WriteInt32("Version", nCheck); nCheck = 1; if ( mpRbEPSColorFormat2->IsChecked() ) nCheck++; - pFilterOptions->WriteInt32(OUString("ColorFormat"), nCheck); + pFilterOptions->WriteInt32("ColorFormat", nCheck); nCheck = 1; if ( mpRbEPSCompressionNone->IsChecked() ) nCheck++; - pFilterOptions->WriteInt32(OUString("CompressionMode"), nCheck); + pFilterOptions->WriteInt32("CompressionMode", nCheck); } break; } @@ -630,11 +630,11 @@ ExportDialog::ExportDialog(FltCallDialogParameter& rPara, mpFilterOptionsItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData ); mnInitialResolutionUnit = mbIsPixelFormat - ? mpOptionsItem->ReadInt32(OUString("PixelExportUnit"), UNIT_DEFAULT) - : mpOptionsItem->ReadInt32(OUString( "VectorExportUnit"), UNIT_DEFAULT); + ? mpOptionsItem->ReadInt32("PixelExportUnit", UNIT_DEFAULT) + : mpOptionsItem->ReadInt32("VectorExportUnit", UNIT_DEFAULT); - mnMaxFilesizeForRealtimePreview = mpOptionsItem->ReadInt32(OUString("MaxFilesizeForRealtimePreview"), 0); - mpFtEstimatedSize->SetText(OUString(" \n ")); + mnMaxFilesizeForRealtimePreview = mpOptionsItem->ReadInt32("MaxFilesizeForRealtimePreview", 0); + mpFtEstimatedSize->SetText(" \n "); SetText( GetText().replaceFirst("%1", maExt) ); //Set dialog title @@ -722,12 +722,12 @@ void ExportDialog::setupSizeControls() if ( mbIsPixelFormat ) // TODO: (metafileresolutionsupport) should be supported for vector formats also... this makes { // sense eg for bitmap fillings in metafiles, to preserve high dpi output // (atm without special vector support the bitmaps are rendered with 96dpi) - sal_Int32 nResolution = mpOptionsItem->ReadInt32(OUString("PixelExportResolution"), 96); + sal_Int32 nResolution = mpOptionsItem->ReadInt32("PixelExportResolution", 96); if ( nResolution < 1 ) nResolution = 96; mpNfResolution->SetValue( nResolution ); - sal_Int32 nResolutionUnit = mpOptionsItem->ReadInt32(OUString("PixelExportResolutionUnit"), 1); + sal_Int32 nResolutionUnit = mpOptionsItem->ReadInt32("PixelExportResolutionUnit", 1); if ( ( nResolutionUnit < 0 ) || ( nResolutionUnit > 2 ) ) nResolutionUnit = 1; mpLbResolution->SelectEntryPos( static_cast< sal_uInt16 >( nResolutionUnit ) ); @@ -740,7 +740,7 @@ void ExportDialog::createFilterOptions() { case FORMAT_JPG : { - sal_Int32 nColor = mpFilterOptionsItem->ReadInt32(OUString("ColorMode"), 0); + sal_Int32 nColor = mpFilterOptionsItem->ReadInt32("ColorMode", 0); if ( nColor == 1 ) nColor = 0; else @@ -752,7 +752,7 @@ void ExportDialog::createFilterOptions() // Quality mpJPGQuality->Show(); - sal_Int32 nQuality = mpFilterOptionsItem->ReadInt32(OUString("Quality"), 75); + sal_Int32 nQuality = mpFilterOptionsItem->ReadInt32("Quality", 75); if ((nQuality < 1 ) || (nQuality > 100)) nQuality = 75; get(mpSbCompression, "compressionjpgsb"); @@ -769,7 +769,7 @@ void ExportDialog::createFilterOptions() { // Compression 1..9 mpPNGCompression->Show(); - sal_Int32 nCompression = mpFilterOptionsItem->ReadInt32(OUString("Compression"), 6); + sal_Int32 nCompression = mpFilterOptionsItem->ReadInt32("Compression", 6); if ( ( nCompression < 1 ) || ( nCompression > 9 ) ) nCompression = 6; @@ -784,16 +784,16 @@ void ExportDialog::createFilterOptions() // Interlaced mpMode->Show(); - mpCbInterlaced->Check(mpFilterOptionsItem->ReadInt32(OUString("Interlaced"), 0) != 0); + mpCbInterlaced->Check(mpFilterOptionsItem->ReadInt32("Interlaced", 0) != 0); // Transparency mpDrawingObjects->Show(); - mpCbSaveTransparency->Check(mpFilterOptionsItem->ReadInt32(OUString("Translucent"), 1) != 0); + mpCbSaveTransparency->Check(mpFilterOptionsItem->ReadInt32("Translucent", 1) != 0); } break; case FORMAT_BMP : { - sal_Int32 nColor = mpFilterOptionsItem->ReadInt32(OUString("Color"), 0); + sal_Int32 nColor = mpFilterOptionsItem->ReadInt32("Color", 0); if ( nColor == 0 ) nColor = 6; else @@ -810,18 +810,18 @@ void ExportDialog::createFilterOptions() // RLE coding mpBMPCompression->Show(); - mpCbRLEEncoding->Check(mpFilterOptionsItem->ReadBool(OUString("RLE_Coding"), true)); + mpCbRLEEncoding->Check(mpFilterOptionsItem->ReadBool("RLE_Coding", true)); } break; case FORMAT_GIF : { // Interlaced mpMode->Show(); - mpCbInterlaced->Check(mpFilterOptionsItem->ReadInt32(OUString("Interlaced"), 1) != 0); + mpCbInterlaced->Check(mpFilterOptionsItem->ReadInt32("Interlaced", 1) != 0); // Transparency mpDrawingObjects->Show(); - mpCbSaveTransparency->Check(mpFilterOptionsItem->ReadInt32(OUString("Translucent"), 1) != 0); + mpCbSaveTransparency->Check(mpFilterOptionsItem->ReadInt32("Translucent", 1) != 0); } break; case FORMAT_PBM : @@ -830,7 +830,7 @@ void ExportDialog::createFilterOptions() { // RB Binary / Text mpEncoding->Show(); - sal_Int32 nFormat = mpFilterOptionsItem->ReadInt32(OUString("FileFormat"), 1); + sal_Int32 nFormat = mpFilterOptionsItem->ReadInt32("FileFormat", 1); mpRbBinary->Check( nFormat == 0 ); mpRbText->Check( nFormat != 0 ); } @@ -839,12 +839,12 @@ void ExportDialog::createFilterOptions() { mpEPSGrid->Show(); - sal_Int32 nPreview = mpFilterOptionsItem->ReadInt32(OUString("Preview"), 0); - sal_Int32 nVersion = mpFilterOptionsItem->ReadInt32(OUString("Version"), 2); - sal_Int32 nColor = mpFilterOptionsItem->ReadInt32(OUString("ColorFormat"), 0); - sal_Int32 nCompr = mpFilterOptionsItem->ReadInt32(OUString("CompressionMode"), 2); + sal_Int32 nPreview = mpFilterOptionsItem->ReadInt32("Preview", 0); + sal_Int32 nVersion = mpFilterOptionsItem->ReadInt32("Version", 2); + sal_Int32 nColor = mpFilterOptionsItem->ReadInt32("ColorFormat", 0); + sal_Int32 nCompr = mpFilterOptionsItem->ReadInt32("CompressionMode", 2); - mpFilterOptionsItem->ReadInt32(OUString("TextMode"), 0); + mpFilterOptionsItem->ReadInt32("TextMode", 0); mpCbEPSPreviewTIFF->Check( ( nPreview & 1 ) != 0 ); mpCbEPSPreviewEPSI->Check( ( nPreview & 2 ) != 0 ); diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx index 0033c541850c..10e94851dc40 100644 --- a/svtools/source/uno/addrtempuno.cxx +++ b/svtools/source/uno/addrtempuno.cxx @@ -82,7 +82,7 @@ namespace { OAddressBookSourceDialogUno::OAddressBookSourceDialogUno(const Reference< XComponentContext >& _rxORB) :OGenericUnoDialog(_rxORB) { - registerProperty(OUString(UNODIALOG_PROPERTY_ALIASES), UNODIALOG_PROPERTY_ID_ALIASES, PropertyAttribute::READONLY, + registerProperty(UNODIALOG_PROPERTY_ALIASES, UNODIALOG_PROPERTY_ID_ALIASES, PropertyAttribute::READONLY, &m_aAliases, cppu::UnoType<decltype(m_aAliases)>::get()); } diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index 92f653bdf184..8713938d37cc 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -56,9 +56,9 @@ OGenericUnoDialog::OGenericUnoDialog(const Reference< XComponentContext >& _rxCo ,m_bNeedInitialization( false ) ,m_aContext(_rxContext) { - registerProperty(OUString(UNODIALOG_PROPERTY_TITLE), UNODIALOG_PROPERTY_ID_TITLE, PropertyAttribute::TRANSIENT, + registerProperty(UNODIALOG_PROPERTY_TITLE, UNODIALOG_PROPERTY_ID_TITLE, PropertyAttribute::TRANSIENT, &m_sTitle, cppu::UnoType<decltype(m_sTitle)>::get()); - registerProperty(OUString(UNODIALOG_PROPERTY_PARENT), UNODIALOG_PROPERTY_ID_PARENT, PropertyAttribute::TRANSIENT, + registerProperty(UNODIALOG_PROPERTY_PARENT, UNODIALOG_PROPERTY_ID_PARENT, PropertyAttribute::TRANSIENT, &m_xParent, cppu::UnoType<decltype(m_xParent)>::get()); } diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index e4aaff3e83f1..63928d1471c8 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -64,7 +64,7 @@ ToolboxController::ToolboxController( , m_aListenerContainer( m_aMutex ) { OSL_ASSERT( m_xContext.is() ); - registerProperty( OUString(TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE), + registerProperty( TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE, TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE, css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY, &m_bSupportVisible, cppu::UnoType<decltype(m_bSupportVisible)>::get()); @@ -86,7 +86,7 @@ ToolboxController::ToolboxController() : , m_nToolBoxId( SAL_MAX_UINT16 ) , m_aListenerContainer( m_aMutex ) { - registerProperty( OUString(TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE), + registerProperty( TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE, TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE, css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY, &m_bSupportVisible, cppu::UnoType<decltype(m_bSupportVisible)>::get()); |