CWS changehid: #i111874#: change code to support HelpIds as byte strings

4 files changed, 26 insertions, 40 deletions

diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc
index 2d7ccd764762..902230466053 100644
--- a/avmedia/inc/helpids.hrc
+++ b/avmedia/inc/helpids.hrc
@@ -30,17 +30,17 @@
 
 #include <svl/solar.hrc>
 
-#define HID_AVMEDIA_TOOLBOXITEM_PLAY    (HID_AVMEDIA_START+0)
-#define HID_AVMEDIA_TOOLBOXITEM_PAUSE   (HID_AVMEDIA_START+1)
-#define HID_AVMEDIA_TOOLBOXITEM_STOP    (HID_AVMEDIA_START+2)
-#define HID_AVMEDIA_TOOLBOXITEM_MUTE    (HID_AVMEDIA_START+3)
-#define HID_AVMEDIA_TOOLBOXITEM_LOOP    (HID_AVMEDIA_START+4)
-#define HID_AVMEDIA_TOOLBOXITEM_OPEN    (HID_AVMEDIA_START+5)
-#define HID_AVMEDIA_TOOLBOXITEM_INSERT  (HID_AVMEDIA_START+6)
-#define HID_AVMEDIA_ZOOMLISTBOX         (HID_AVMEDIA_START+7)
-#define HID_AVMEDIA_TIMESLIDER          (HID_AVMEDIA_START+8)
-#define HID_AVMEDIA_TIMEEDIT            (HID_AVMEDIA_START+9)
-#define HID_AVMEDIA_VOLUMESLIDER        (HID_AVMEDIA_START+10)
-#define HID_AVMEDIA_PLAYERWINDOW        (HID_AVMEDIA_START+11)
+#define HID_AVMEDIA_TOOLBOXITEM_PLAY                       "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY"
+#define HID_AVMEDIA_TOOLBOXITEM_PAUSE                      "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE"
+#define HID_AVMEDIA_TOOLBOXITEM_STOP                       "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_STOP"
+#define HID_AVMEDIA_TOOLBOXITEM_MUTE                       "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_MUTE"
+#define HID_AVMEDIA_TOOLBOXITEM_LOOP                       "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_LOOP"
+#define HID_AVMEDIA_TOOLBOXITEM_OPEN                       "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_OPEN"
+#define HID_AVMEDIA_TOOLBOXITEM_INSERT                     "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_INSERT"
+#define HID_AVMEDIA_ZOOMLISTBOX                            "AVMEDIA_HID_AVMEDIA_ZOOMLISTBOX"
+#define HID_AVMEDIA_TIMESLIDER                             "AVMEDIA_HID_AVMEDIA_TIMESLIDER"
+#define HID_AVMEDIA_TIMEEDIT                               "AVMEDIA_HID_AVMEDIA_TIMEEDIT"
+#define HID_AVMEDIA_VOLUMESLIDER                           "AVMEDIA_HID_AVMEDIA_VOLUMESLIDER"
+#define HID_AVMEDIA_PLAYERWINDOW                           "AVMEDIA_HID_AVMEDIA_PLAYERWINDOW"
 
 #endif // _AVMEDIA_HELPIDS_HRC
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 781f2b7d290d..a71b5268abd7 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -94,12 +94,10 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
 
 
         maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_OPEN, implGetImage( AVMEDIA_IMG_OPEN ), String( AVMEDIA_RESID( AVMEDIA_STR_OPEN ) ) );
-        // FIXME: HELPID
-        maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_OPEN, ""/*HID_AVMEDIA_TOOLBOXITEM_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 ) ) );
-        // FIXME: HELPID
-        maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_INSERT, ""/*HID_AVMEDIA_TOOLBOXITEM_INSERT*/ );
+        maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_INSERT, HID_AVMEDIA_TOOLBOXITEM_INSERT );
 
         maPlayToolBox.InsertSeparator();
     }
@@ -119,22 +117,18 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
     }
 
     maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_PLAY, implGetImage( AVMEDIA_IMG_PLAY ), String( AVMEDIA_RESID( AVMEDIA_STR_PLAY ) ), TIB_CHECKABLE );
-    // FIXME: HELPID
-       maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PLAY, ""/*HID_AVMEDIA_TOOLBOXITEM_PLAY*/ );
+       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 );
-    // FIXME: HELPID
-       maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PAUSE, ""/*HID_AVMEDIA_TOOLBOXITEM_PAUSE*/ );
+       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 );
-    // FIXME: HELPID
-       maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_STOP, ""/*HID_AVMEDIA_TOOLBOXITEM_STOP*/ );
+       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 ) ) );
-    // FIXME: HELPID
-       maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_LOOP, ""/*HID_AVMEDIA_TOOLBOXITEM_LOOP*/ );
+       maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_LOOP, HID_AVMEDIA_TOOLBOXITEM_LOOP );
 
     if( MEDIACONTROLSTYLE_SINGLELINE == meControlStyle )
         maPlayToolBox.InsertSeparator();
@@ -147,8 +141,7 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
     maTimeSlider.SetSlideHdl( LINK( this, MediaControl, implTimeHdl ) );
     maTimeSlider.SetEndSlideHdl( LINK( this, MediaControl, implTimeEndHdl ) );
     maTimeSlider.SetRange( Range( 0, AVMEDIA_TIME_RANGE ) );
-    // FIXME: HELPID
-    maTimeSlider.SetHelpId( ""/*HID_AVMEDIA_TIMESLIDER*/ );
+    maTimeSlider.SetHelpId( HID_AVMEDIA_TIMESLIDER );
     maTimeSlider.SetUpdateMode( true );
     maTimeSlider.SetSizePixel( Size( 128, maPlayToolBox.GetSizePixel().Height() ) );
     maTimeSlider.Show();
@@ -158,8 +151,7 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
     maTimeEdit.SetUpdateMode( true );
     maTimeEdit.SetSizePixel( Size( maTimeEdit.GetTextWidth( aTimeText ) + 8, maPlayToolBox.GetSizePixel().Height() ) );
     maTimeEdit.SetControlBackground( Application::GetSettings().GetStyleSettings().GetWindowColor() );
-    // FIXME: HELPID
-    maTimeEdit.SetHelpId( ""/*HID_AVMEDIA_TIMEEDIT*/ );
+    maTimeEdit.SetHelpId( HID_AVMEDIA_TIMEEDIT );
     maTimeEdit.Disable();
     maTimeEdit.Show();
     maMinSize.Width() += maTimeEdit.GetSizePixel().Width();
@@ -168,8 +160,7 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
         maMuteToolBox.InsertSeparator();
 
     maMuteToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_MUTE, implGetImage( AVMEDIA_IMG_MUTE ), String( AVMEDIA_RESID( AVMEDIA_STR_MUTE ) ) );
-    // FIXME: HELPID
-       maMuteToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_MUTE, ""/*HID_AVMEDIA_TOOLBOXITEM_MUTE*/ );
+       maMuteToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_MUTE, HID_AVMEDIA_TOOLBOXITEM_MUTE );
 
     maMuteToolBox.SetSelectHdl( LINK( this, MediaControl, implSelectHdl ) );
     maMuteToolBox.SetSizePixel( maMuteToolBox.CalcWindowSizePixel() );
@@ -180,8 +171,7 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
     maVolumeSlider.SetEndSlideHdl( LINK( this, MediaControl, implVolumeEndHdl ) );
     maVolumeSlider.SetRange( Range( AVMEDIA_DB_RANGE, 0 ) );
     maVolumeSlider.SetUpdateMode( true );
-    // FIXME: HELPID
-    maVolumeSlider.SetHelpId( ""/*HID_AVMEDIA_VOLUMESLIDER*/ );
+    maVolumeSlider.SetHelpId( HID_AVMEDIA_VOLUMESLIDER );
     maVolumeSlider.SetSizePixel( Size( 48, maPlayToolBox.GetSizePixel().Height() ) );
     maVolumeSlider.Show();
     maMinSize.Width() += maVolumeSlider.GetSizePixel().Width();
@@ -192,12 +182,10 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
     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->SetSelectHdl( LINK( this, MediaControl, implZoomSelectHdl ) );
-    // FIXME: HELPID
-    mpZoomListBox->SetHelpId( ""/*HID_AVMEDIA_ZOOMLISTBOX*/ );
+    mpZoomListBox->SetHelpId( HID_AVMEDIA_ZOOMLISTBOX );
 
     maZoomToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_ZOOM, String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM ) ) );
-    // FIXME: HELPID
-    maZoomToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_ZOOM, ""/*HID_AVMEDIA_ZOOMLISTBOX*/ );
+    maZoomToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_ZOOM, HID_AVMEDIA_ZOOMLISTBOX );
 
     maZoomToolBox.SetItemWindow( AVMEDIA_TOOLBOXITEM_ZOOM, mpZoomListBox );
     maZoomToolBox.SetSelectHdl( LINK( this, MediaControl, implSelectHdl ) );
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index c66f88817fe3..caab783c6a7c 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -124,8 +124,7 @@ void MediaFloater::ToggleFloatingMode()
     Window* pWindow = mpMediaWindow->getWindow();
 
     if( pWindow )
-        // FIXME: HELPID
-        pWindow->SetHelpId( ""/*HID_AVMEDIA_PLAYERWINDOW*/ );
+        pWindow->SetHelpId( HID_AVMEDIA_PLAYERWINDOW );
 
     mpMediaWindow->show();
 }
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 14d174beec80..553eea6196c1 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -179,8 +179,7 @@ MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bo
     mpEmptyBmpEx( NULL ),
     mpAudioBmpEx( NULL )
 {
-    // FIXME: HELPID
-    maChildWindow.SetHelpId( ""/*HID_AVMEDIA_PLAYERWINDOW*/ );
+    maChildWindow.SetHelpId( HID_AVMEDIA_PLAYERWINDOW );
     maChildWindow.Hide();
 
     if( mpMediaWindowControl )