sb131: merged in re/DEV300_next towards DEV300_m94

5 files changed, 37 insertions, 7 deletions

diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 142da37eb892..77180a01ac05 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1498,13 +1498,13 @@ namespace
 } // annonymous
 // .........................................................................
 // -----------------------------------------------------------------------------
-::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName,const sal_Int32 _nHelpId)
+::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName, const rtl::OString& sHelpId)
 {
     ::com::sun::star::util::URL aURL;
     aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ) );
     aURL.Complete += _sModuleName;
     aURL.Complete += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
-    aURL.Complete += ::rtl::OUString::valueOf(_nHelpId);
+    aURL.Complete += ::rtl::OUString(sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8);
 
     ::rtl::OUString sAnchor;
     ::rtl::OUString sTempURL = aURL.Complete;
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index d54a056f863e..803554a0094f 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -92,8 +92,8 @@ OWizNameMatching::OWizNameMatching( Window* pParent)
     m_CTRL_RIGHT.SetSelectHdl(LINK(this,OWizNameMatching,TableListRightSelectHdl));
     m_CTRL_RIGHT.EnableCheckButton( NULL );
 
-    m_CTRL_LEFT.SetWindowBits( WB_FORCE_MAKEVISIBLE );
-    m_CTRL_RIGHT.SetWindowBits( WB_FORCE_MAKEVISIBLE );
+    m_CTRL_LEFT.SetStyle( m_CTRL_LEFT.GetStyle() | WB_FORCE_MAKEVISIBLE );
+    m_CTRL_RIGHT.SetStyle( m_CTRL_RIGHT.GetStyle() | WB_FORCE_MAKEVISIBLE );
 
     m_sSourceText   = m_FT_TABLE_LEFT.GetText();
     m_sSourceText.AppendAscii("\n");
@@ -405,7 +405,7 @@ OColumnTreeBox::OColumnTreeBox( Window* pParent, const ResId& rResId )
 {
     SetDragDropMode( 0 );
     EnableInplaceEditing( sal_False );
-    SetWindowBits(WB_BORDER | WB_HASBUTTONS | WB_HSCROLL);
+    SetStyle(GetStyle() | WB_BORDER | WB_HASBUTTONS | WB_HSCROLL);
     SetSelectionMode( SINGLE_SELECTION );
 }
 //------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index f33c82abecb7..fa72a03269cc 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -70,6 +70,8 @@
 #include "FieldControls.hxx"
 #endif
 
+#include "dbaccess_slotid.hrc"
+
 using namespace ::dbaui;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src
index 9871c3f7d810..d9c9772d2a41 100644
--- a/dbaccess/source/ui/misc/WizardPages.src
+++ b/dbaccess/source/ui/misc/WizardPages.src
@@ -35,6 +35,7 @@
 #include "dbaccess_helpid.hrc"
 #endif
 
+#include "dbaccess_slotid.hrc"
 
 #define WINDOW_SIZE_X   276
 #define WINDOW_SIZE_Y   185
@@ -67,6 +68,7 @@ String STR_WIZ_NAME_MATCHING_TITEL
 
 ModalDialog WIZ_RTFCOPYTABLE
 {
+    HelpID = "dbaccess:ModalDialog:WIZ_RTFCOPYTABLE";
 
     Text [ en-US ] = "Copy RTF Table" ;
 
@@ -91,12 +93,14 @@ ModalDialog WIZ_RTFCOPYTABLE
     };
     PushButton PB_PREV
     {
+        HelpID = "dbaccess:PushButton:WIZ_RTFCOPYTABLE:PB_PREV";
         TabStop             = TRUE ;
         Size                = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ;
         Text [ en-US ] = "< ~Back";
     };
     PushButton PB_NEXT
     {
+        HelpID = "dbaccess:PushButton:WIZ_RTFCOPYTABLE:PB_NEXT";
         TabStop             = TRUE ;
         Size                = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ;
         Text [ en-US ] = "~Next>";
@@ -130,6 +134,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
 
     MultiListBox LB_ORG_COLUMN_NAMES
     {
+        HelpID = "dbaccess:MultiListBox:TAB_WIZ_COLUMN_SELECT:LB_ORG_COLUMN_NAMES";
         Border              = TRUE ;
         Pos                 = MAP_APPFONT ( WINDOW_BORDER_X , WINDOW_BORDER_Y ) ;
         Size                = MAP_APPFONT ( 95 , WINDOW_SIZE_Y - 23 ) ;
@@ -142,6 +147,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
     };
     ImageButton IB_COLUMN_RH
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMN_RH";
         Pos                 = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 25 ) ;
         Size                = MAP_APPFONT ( 20 , 14 ) ;
         TabStop             = TRUE ;
@@ -161,6 +167,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
     };
     ImageButton IB_COLUMNS_RH
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMNS_RH";
         Pos                 = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 45 ) ;
         Size                = MAP_APPFONT ( 20 , 14 ) ;
         TabStop             = TRUE;
@@ -181,6 +188,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
     };
     ImageButton IB_COLUMN_LH
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMN_LH";
         Pos                 = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 65) ;
         Size                = MAP_APPFONT ( 20 , 14 ) ;
         TabStop             = TRUE ;
@@ -200,6 +208,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
     };
     ImageButton IB_COLUMNS_LH
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMNS_LH";
         Pos                 = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 85) ;
         Size                = MAP_APPFONT ( 20 , 14 ) ;
         TabStop             = TRUE ;
@@ -220,6 +229,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
 
     MultiListBox LB_NEW_COLUMN_NAMES
     {
+        HelpID = "dbaccess:MultiListBox:TAB_WIZ_COLUMN_SELECT:LB_NEW_COLUMN_NAMES";
         Border              = TRUE ;
         Pos                 = MAP_APPFONT ( WINDOW_BORDER_X + 157, WINDOW_BORDER_Y) ;
         Size                = MAP_APPFONT ( 95 , WINDOW_SIZE_Y - 23 ) ;
@@ -245,6 +255,7 @@ TabPage TAB_WIZ_TYPE_SELECT
 
     MultiListBox LB_NEW_COLUMN_NAMES
     {
+        HelpID = "dbaccess:MultiListBox:TAB_WIZ_TYPE_SELECT:LB_NEW_COLUMN_NAMES";
         Border              = TRUE ;
         Pos                 = MAP_APPFONT ( 6 , 6 ) ;
         Size                = MAP_APPFONT ( 87 , WINDOW_SIZE_Y - 12 ) ;
@@ -264,6 +275,7 @@ TabPage TAB_WIZ_TYPE_SELECT
 
     TabPage CONTROL_CONTAINER
     {
+        HelpID = "dbaccess:TabPage:CONTROL_CONTAINER";
         Pos                 = MAP_APPFONT ( 102 , WINDOW_BORDER_Y  ) ;
         Size                = MAP_APPFONT ( WINDOW_SIZE_X -  111, WINDOW_SIZE_Y - WINDOW_BORDER_Y - 67 );
         SVLook              = TRUE;
@@ -286,6 +298,7 @@ TabPage TAB_WIZ_TYPE_SELECT
 
     NumericField ET_AUTO
     {
+        HelpID = "dbaccess:NumericField:TAB_WIZ_TYPE_SELECT:ET_AUTO";
         Border              = TRUE ;
         Pos                 = MAP_APPFONT ( 151 , WINDOW_SIZE_Y - WINDOW_BORDER_Y - 29) ;
         Size                = MAP_APPFONT ( 40 , 12 ) ;
@@ -294,6 +307,7 @@ TabPage TAB_WIZ_TYPE_SELECT
 
     PushButton PB_AUTO
     {
+        HelpID = "dbaccess:PushButton:TAB_WIZ_TYPE_SELECT:PB_AUTO";
         Pos                 = MAP_APPFONT ( WINDOW_SIZE_X - 62 , WINDOW_SIZE_Y - WINDOW_BORDER_Y - 30 ) ;
         Size                = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ;
         TabStop             = TRUE ;
@@ -308,7 +322,7 @@ Menu RID_SBA_RTF_PKEYPOPUP
         MenuItem
         {
             Identifier      = SID_TABLEDESIGN_TABED_PRIMARYKEY ;
-            HelpID          = SID_TABLEDESIGN_TABED_PRIMARYKEY ;
+            HelpID          = HID_TABLEDESIGN_TABED_PRIMARYKEY ;
             Checkable       = TRUE ;
             Text [ en-US ] = "Primary Key" ;
         };
@@ -319,6 +333,7 @@ Menu RID_SBA_RTF_PKEYPOPUP
  //==================================================================
 TabPage TAB_WIZ_NAME_MATCHING
 {
+    HelpID = "dbaccess:TabPage:TAB_WIZ_NAME_MATCHING";
     SVLook  = TRUE ;
     Size    = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
 
@@ -360,6 +375,7 @@ TabPage TAB_WIZ_NAME_MATCHING
 
     ImageButton IB_COLUMN_UP
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP";
         Pos                 = MAP_APPFONT ( 19 ,  45 ) ;
         Size                = MAP_APPFONT ( 14 , 14 ) ;
         TabStop             = TRUE;
@@ -380,6 +396,7 @@ TabPage TAB_WIZ_NAME_MATCHING
     };
     ImageButton IB_COLUMN_DOWN
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN";
         Pos                 = MAP_APPFONT ( 19 ,  63 ) ;
         Size                = MAP_APPFONT ( 14 , 14 ) ;
         TabStop             = TRUE;
@@ -399,6 +416,7 @@ TabPage TAB_WIZ_NAME_MATCHING
     };
     ImageButton IB_COLUMN_UP_RIGHT
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP_RIGHT";
         Pos                 = MAP_APPFONT ( WINDOW_SIZE_X - 33, 45 ) ;
         Size                = MAP_APPFONT ( 14 , 14 ) ;
         TabStop             = TRUE;
@@ -419,6 +437,7 @@ TabPage TAB_WIZ_NAME_MATCHING
     };
     ImageButton IB_COLUMN_DOWN_RIGHT
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN_RIGHT";
         Pos                 = MAP_APPFONT ( WINDOW_SIZE_X - 33, 63) ;
         Size                = MAP_APPFONT ( 14 , 14 ) ;
         TabStop             = TRUE ;
@@ -439,6 +458,7 @@ TabPage TAB_WIZ_NAME_MATCHING
 
     PushButton PB_ALL
     {
+        HelpID = "dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_ALL";
         Pos                 = MAP_APPFONT ( 6, 83) ;
         Size                = MAP_APPFONT ( 40 , 14 ) ;
         TabStop             = TRUE ;
@@ -447,6 +467,7 @@ TabPage TAB_WIZ_NAME_MATCHING
 
     PushButton PB_NONE
     {
+        HelpID = "dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_NONE";
         Pos                 = MAP_APPFONT ( 6, 103) ;
         Size                = MAP_APPFONT ( 40 , 14 ) ;
         TabStop             = TRUE ;
@@ -485,12 +506,14 @@ TabPage TAB_WIZ_COPYTABLE
     };
     RadioButton RB_DEFDATA
     {
+        HelpID = "dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_DEFDATA";
         Pos                 = MAP_APPFONT ( 12 , 35 ) ;
         Size                = MAP_APPFONT ( 73 , 10 ) ;
         Text [ en-US ] = "De~finition and data" ;
     };
     RadioButton RB_DEF
     {
+        HelpID = "dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_DEF";
         Pos                 = MAP_APPFONT ( 12, 49 ) ;
         Size                = MAP_APPFONT ( 73 , 10 ) ;
         Text [ en-US ] = "Def~inition" ;
@@ -498,6 +521,7 @@ TabPage TAB_WIZ_COPYTABLE
 
     RadioButton RB_VIEW
     {
+        HelpID = "dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_VIEW";
         Pos                 = MAP_APPFONT ( 12, 63 ) ;
         Size                = MAP_APPFONT ( 73 , 10 ) ;
         Text [ en-US ] = "A~s table view";
@@ -505,6 +529,7 @@ TabPage TAB_WIZ_COPYTABLE
 
     RadioButton RB_APPENDDATA
     {
+        HelpID = "dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_APPENDDATA";
         Pos                 = MAP_APPFONT ( 12, 77 ) ;
         Size                = MAP_APPFONT ( 73 , 10 ) ;
         Text [ en-US ] = "Append ~data" ;
@@ -512,6 +537,7 @@ TabPage TAB_WIZ_COPYTABLE
 
     CheckBox CB_USEHEADERLINE
     {
+        HelpID = "dbaccess:CheckBox:TAB_WIZ_COPYTABLE:CB_USEHEADERLINE";
         Pos                 = MAP_APPFONT ( 12, 93 ) ;
         Size                = MAP_APPFONT ( WINDOW_SIZE_X - 18, 10 ) ;
         Text [ en-US ] = "Use first ~line as column names" ;
@@ -519,6 +545,7 @@ TabPage TAB_WIZ_COPYTABLE
 
     CheckBox CB_PRIMARY_COLUMN
     {
+        HelpID = "dbaccess:CheckBox:TAB_WIZ_COPYTABLE:CB_PRIMARY_COLUMN";
         Pos                 = MAP_APPFONT ( 12, 107 ) ;
         Size                = MAP_APPFONT ( 90 , 10 ) ;
         Text [ en-US ] = "Crea~te primary key";
@@ -532,6 +559,7 @@ TabPage TAB_WIZ_COPYTABLE
 
     Edit ET_KEYNAME
     {
+        HelpID = "dbaccess:Edit:TAB_WIZ_COPYTABLE:ET_KEYNAME";
         Pos                 = MAP_APPFONT ( 80, 120 ) ;
         Size                = MAP_APPFONT ( 65 , 12 ) ;
         TabStop             = TRUE ;
diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src
index 552a076147d5..22bc80670cf6 100644
--- a/dbaccess/source/ui/misc/dbumiscres.src
+++ b/dbaccess/source/ui/misc/dbumiscres.src
@@ -96,5 +96,5 @@ String STR_NAMED_OBJECT_ALREADY_EXISTS
 String RID_STR_EXTENSION_NOT_PRESENT
 {
     // #i96130# use hard coded name
-    Text [ en-US ] = "The report, \"$file$\", requires the extension Sun Report Builder.";
+    Text [ en-US ] = "The report, \"$file$\", requires the extension Oracle Report Builder.";
 };