Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2493
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/93/2493/1
fdo#38838, replace String with OUString
Change-Id: I84e49275ffc8627e93f32ae522c621d39a4eda72
---
M avmedia/source/framework/mediacontrol.cxx
M basctl/source/basicide/basdoc.cxx
M basctl/source/basicide/basdoc.hxx
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/avmedia/source/framework/mediacontrol.cxx
b/avmedia/source/framework/mediacontrol.cxx
index cd22561..553d130 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -75,7 +75,7 @@
meControlStyle( eControlStyle ),
mbLocked( false )
{
- const String aTimeText( " 00:00:00/00:00:00 " );
+ const OUString aTimeText( " 00:00:00/00:00:00 " );
SetBackground();
SetPaintTransparent( sal_True );
@@ -83,10 +83,10 @@
if( MEDIACONTROLSTYLE_SINGLELINE != meControlStyle )
{
- maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_OPEN, implGetImage(
AVMEDIA_IMG_OPEN ), String( AVMEDIA_RESID( AVMEDIA_STR_OPEN ) ) );
+ maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_OPEN, implGetImage(
AVMEDIA_IMG_OPEN ), OUString( AVMEDIA_RESID( AVMEDIA_STR_OPEN ) ) );
maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_OPEN,
HID_AVMEDIA_TOOLBOXITEM_OPEN );
- maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_INSERT, implGetImage(
AVMEDIA_IMG_INSERT ), String( AVMEDIA_RESID( AVMEDIA_STR_INSERT ) ) );
+ maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_INSERT, implGetImage(
AVMEDIA_IMG_INSERT ), OUString( AVMEDIA_RESID( AVMEDIA_STR_INSERT ) ) );
maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_INSERT,
HID_AVMEDIA_TOOLBOXITEM_INSERT );
maPlayToolBox.InsertSeparator();
@@ -104,18 +104,18 @@
}
- maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_PLAY, implGetImage(
AVMEDIA_IMG_PLAY ), String( AVMEDIA_RESID( AVMEDIA_STR_PLAY ) ), TIB_CHECKABLE
);
+ maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_PLAY, implGetImage(
AVMEDIA_IMG_PLAY ), OUString( AVMEDIA_RESID( AVMEDIA_STR_PLAY ) ),
TIB_CHECKABLE );
maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PLAY,
HID_AVMEDIA_TOOLBOXITEM_PLAY );
- maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_PAUSE, implGetImage(
AVMEDIA_IMG_PAUSE ), String( AVMEDIA_RESID( AVMEDIA_STR_PAUSE ) ),
TIB_CHECKABLE );
+ maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_PAUSE, implGetImage(
AVMEDIA_IMG_PAUSE ), OUString( AVMEDIA_RESID( AVMEDIA_STR_PAUSE ) ),
TIB_CHECKABLE );
maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PAUSE,
HID_AVMEDIA_TOOLBOXITEM_PAUSE );
- maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_STOP, implGetImage(
AVMEDIA_IMG_STOP ), String( AVMEDIA_RESID( AVMEDIA_STR_STOP ) ), TIB_CHECKABLE
);
+ maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_STOP, implGetImage(
AVMEDIA_IMG_STOP ), OUString( AVMEDIA_RESID( AVMEDIA_STR_STOP ) ),
TIB_CHECKABLE );
maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_STOP,
HID_AVMEDIA_TOOLBOXITEM_STOP );
maPlayToolBox.InsertSeparator();
- maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_LOOP, implGetImage(
AVMEDIA_IMG_ENDLESS ), String( AVMEDIA_RESID( AVMEDIA_STR_ENDLESS ) ) );
+ maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_LOOP, implGetImage(
AVMEDIA_IMG_ENDLESS ), OUString( AVMEDIA_RESID( AVMEDIA_STR_ENDLESS ) ) );
maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_LOOP,
HID_AVMEDIA_TOOLBOXITEM_LOOP );
if( MEDIACONTROLSTYLE_SINGLELINE == meControlStyle )
@@ -147,7 +147,7 @@
if( MEDIACONTROLSTYLE_SINGLELINE == meControlStyle )
maMuteToolBox.InsertSeparator();
- maMuteToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_MUTE, implGetImage(
AVMEDIA_IMG_MUTE ), String( AVMEDIA_RESID( AVMEDIA_STR_MUTE ) ) );
+ maMuteToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_MUTE, implGetImage(
AVMEDIA_IMG_MUTE ), OUString( AVMEDIA_RESID( AVMEDIA_STR_MUTE ) ) );
maMuteToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_MUTE,
HID_AVMEDIA_TOOLBOXITEM_MUTE );
maMuteToolBox.SetSelectHdl( LINK( this, MediaControl, implSelectHdl ) );
@@ -165,14 +165,14 @@
maMinSize.Width() += maVolumeSlider.GetSizePixel().Width();
mpZoomListBox->SetSizePixel( Size( maTimeEdit.GetSizePixel().Width(), 260
) );
- mpZoomListBox->InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_50 )
), AVMEDIA_ZOOMLEVEL_50 );
- mpZoomListBox->InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_100 )
), AVMEDIA_ZOOMLEVEL_100 );
- mpZoomListBox->InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_200 )
), AVMEDIA_ZOOMLEVEL_200 );
- mpZoomListBox->InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_FIT )
), AVMEDIA_ZOOMLEVEL_FIT );
+ mpZoomListBox->InsertEntry( OUString( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_50 )
), AVMEDIA_ZOOMLEVEL_50 );
+ mpZoomListBox->InsertEntry( OUString( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_100
) ), AVMEDIA_ZOOMLEVEL_100 );
+ mpZoomListBox->InsertEntry( OUString( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_200
) ), AVMEDIA_ZOOMLEVEL_200 );
+ mpZoomListBox->InsertEntry( OUString( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_FIT
) ), AVMEDIA_ZOOMLEVEL_FIT );
mpZoomListBox->SetSelectHdl( LINK( this, MediaControl, implZoomSelectHdl )
);
mpZoomListBox->SetHelpId( HID_AVMEDIA_ZOOMLISTBOX );
- maZoomToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_ZOOM, String( AVMEDIA_RESID(
AVMEDIA_STR_ZOOM ) ) );
+ maZoomToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_ZOOM, OUString(
AVMEDIA_RESID( AVMEDIA_STR_ZOOM ) ) );
maZoomToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_ZOOM, HID_AVMEDIA_ZOOMLISTBOX
);
maZoomToolBox.SetItemWindow( AVMEDIA_TOOLBOXITEM_ZOOM, mpZoomListBox );
diff --git a/basctl/source/basicide/basdoc.cxx
b/basctl/source/basicide/basdoc.cxx
index 119657c..d682f4e 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -70,7 +70,7 @@
pPrinter.reset(pPr);
}
-void DocShell::FillClass( SvGlobalName*, sal_uInt32*, String*, String*,
String*, sal_Int32, sal_Bool bTemplate) const
+void DocShell::FillClass( SvGlobalName*, sal_uInt32*, OUString*, OUString*,
OUString*, sal_Int32, sal_Bool bTemplate) const
{
(void)bTemplate;
DBG_ASSERT( !bTemplate, "No template for Basic" );
diff --git a/basctl/source/basicide/basdoc.hxx
b/basctl/source/basicide/basdoc.hxx
index 19a0ae6..e471545 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -41,9 +41,9 @@
sal_uInt16 nAspect = ASPECT_CONTENT );
virtual void FillClass( SvGlobalName * pClassName,
sal_uInt32 * pFormat,
- String * pAppName,
- String * pFullTypeName,
- String * pShortTypeName,
+ OUString * pAppName,
+ OUString * pFullTypeName,
+ OUString * pShortTypeName,
sal_Int32 nVersion,
sal_Bool bTemplate = false ) const;
--
To view, visit https://gerrit.libreoffice.org/2493
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I84e49275ffc8627e93f32ae522c621d39a4eda72
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ádám Király <kiraly.adam.cs...@gmail.com>
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
