diff options
100 files changed, 860 insertions, 1218 deletions
diff --git a/l10ntools/scripts/keyidGen.pl b/l10ntools/scripts/keyidGen.pl index 2a4ac5caefc3..53423c2d6f02 100644 --- a/l10ntools/scripts/keyidGen.pl +++ b/l10ntools/scripts/keyidGen.pl @@ -112,7 +112,7 @@ sub makenumber $h = shift; # 1 2 3 4 # 1234567890123456789012345678901234567890 - $symbols="0123456789abcdefghijklmnopqrstuvwxyz+-<=>"; + $symbols="0123456789abcdefghijklmnopqrstuvwxyz+-[=]"; $order = length($symbols); $result = ""; while ( length( $result ) < 6 ) diff --git a/l10ntools/scripts/localize.pl b/l10ntools/scripts/localize.pl index 230b6d46f395..323f7fe549b6 100755 --- a/l10ntools/scripts/localize.pl +++ b/l10ntools/scripts/localize.pl @@ -175,8 +175,9 @@ sub splitfile{ exit( -1 ); } my $src_root = $ENV{SOURCE_ROOT_DIR}; + my $ooo_src_root = $ENV{SRC_ROOT}; my $so_l10n_path = $src_root."/sun/l10n_so/source"; - my $ooo_l10n_path = $src_root."/ooo/l10n/source"; + my $ooo_l10n_path = $ooo_src_root."/l10n/source"; #print "$so_l10n_path\n"; #print "$ooo_l10n_path\n"; diff --git a/l10ntools/source/help/HelpLinker.cxx b/l10ntools/source/help/HelpLinker.cxx index 411859bfe994..8e6976c0efd1 100644 --- a/l10ntools/source/help/HelpLinker.cxx +++ b/l10ntools/source/help/HelpLinker.cxx @@ -273,12 +273,10 @@ private: std::string extdestination; std::string module; std::string lang; - std::string hid; std::string extensionPath; std::string extensionDestination; bool bExtensionMode; fs::path indexDirName; - Stringtable hidlistTranslation; fs::path indexDirParentName; bool init; IndexerPreProcessor* m_pIndexerPreProcessor; @@ -331,13 +329,6 @@ void HelpLinker::addBookmark( DB* dbBase, FILE* pFile_DBHelp, std::string thishi HCDBG(std::cerr << "HelpLinker::addBookmark " << thishid << " " << fileB << " " << anchorB << " " << jarfileB << " " << titleB << std::endl); - std::string temp = thishid; - std::transform (temp.begin(), temp.end(), temp.begin(), toupper); - std::replace(temp.begin(), temp.end(), ':', '_'); - const std::string& translatedHid = hidlistTranslation[temp]; - if (!translatedHid.empty()) - thishid = translatedHid; - thishid = URLEncoder::encode(thishid); DBT key; @@ -472,20 +463,6 @@ void HelpLinker::link() throw( HelpProcessingException ) try { - std::ifstream fileReader(hid.c_str()); - while (fileReader) - { - std::string key; - fileReader >> key; - std::transform (key.begin(), key.end(), key.begin(), toupper); - std::replace(key.begin(), key.end(), ':', '_'); - std::string data; - fileReader >> data; - if (!key.empty() && !data.empty()) - hidlistTranslation[key] = data; - } - fileReader.close(); - // lastly, initialize the indexBuilder if ( (!bExtensionMode || bIndexForExtension) && !helpFiles.empty()) initIndexerPreProcessor(); @@ -651,13 +628,6 @@ void HelpLinker::link() throw( HelpProcessingException ) std::string helpTextId = helpTextIter->first; const std::string& helpTextText = helpTextIter->second; - std::string temp = helpTextId; - std::transform (temp.begin(), temp.end(), temp.begin(), toupper); - std::replace(temp.begin(), temp.end(), ':', '_'); - - const std::string& tHid = hidlistTranslation[temp]; - if (!tHid.empty()) - helpTextId = tHid; helpTextId = URLEncoder::encode(helpTextId); DBT keyDbt; @@ -912,14 +882,7 @@ void HelpLinker::main( std::vector<std::string> &args, else if (args[i].compare("-hid") == 0) { ++i; - if (i >= args.size()) - { - std::stringstream aStrStream; - aStrStream << "hid list missing" << std::endl; - throw HelpProcessingException( HELPPROCESSING_GENERAL_ERROR, aStrStream.str() ); - } - - hid = args[i]; + throw HelpProcessingException( HELPPROCESSING_GENERAL_ERROR, "obsolete -hid argument used" ); } else if (args[i].compare("-add") == 0) { @@ -1076,12 +1039,6 @@ void HelpLinker::main( std::vector<std::string> &args, aStrStream << "language missing" << std::endl; throw HelpProcessingException( HELPPROCESSING_GENERAL_ERROR, aStrStream.str() ); } - if (!bExtensionMode && hid.empty()) - { - std::stringstream aStrStream; - aStrStream << "hid list missing" << std::endl; - throw HelpProcessingException( HELPPROCESSING_GENERAL_ERROR, aStrStream.str() ); - } link(); } diff --git a/padmin/source/padialog.src b/padmin/source/padialog.src index ab09d9155d1b..09ce29a2c682 100644 --- a/padmin/source/padialog.src +++ b/padmin/source/padialog.src @@ -29,6 +29,7 @@ ModalDialog RID_FONTIMPORT_DIALOG { + HelpID = "padmin:ModalDialog:RID_FONTIMPORT_DIALOG"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 230 , 185 ); @@ -37,6 +38,7 @@ ModalDialog RID_FONTIMPORT_DIALOG ListBox RID_FIMP_BOX_NEWFONTS { + HelpID = "padmin:ListBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_NEWFONTS"; Border = TRUE; Sort=TRUE; AutoHScroll = TRUE; @@ -58,18 +60,21 @@ ModalDialog RID_FONTIMPORT_DIALOG }; Edit RID_FIMP_EDT_FROM { + HelpID = "padmin:Edit:RID_FONTIMPORT_DIALOG:RID_FIMP_EDT_FROM"; Border = TRUE; Pos = MAP_APPFONT( 10, 97 ); Size = MAP_APPFONT( 130, 12 ); }; PushButton RID_FIMP_BTN_FROM { + HelpID = "padmin:PushButton:RID_FONTIMPORT_DIALOG:RID_FIMP_BTN_FROM"; Pos = MAP_APPFONT( 145, 97 ); Size = MAP_APPFONT( 15, 12 ); Text = "..."; }; CheckBox RID_FIMP_BOX_SUBDIRS { + HelpID = "padmin:CheckBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_SUBDIRS"; Pos = MAP_APPFONT( 10, 115 ); Size = MAP_APPFONT( 145, 10 ); Text [ en-US ] = "Sea~rch Subdirectories"; @@ -83,6 +88,7 @@ ModalDialog RID_FONTIMPORT_DIALOG CheckBox RID_FIMP_BOX_LINKONLY { + HelpID = "padmin:CheckBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_LINKONLY"; Pos = MAP_APPFONT( 10, 140 ); Size = MAP_APPFONT( 145, 10 ); Text [ en-US ] = "Create ~soft links only"; @@ -100,6 +106,7 @@ ModalDialog RID_FONTIMPORT_DIALOG }; PushButton RID_FIMP_BTN_SELECTALL { + HelpID = "padmin:PushButton:RID_FONTIMPORT_DIALOG:RID_FIMP_BTN_SELECTALL"; Pos = MAP_APPFONT( 175, 44 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Select All"; @@ -146,6 +153,7 @@ ModalDialog RID_FONTIMPORT_DIALOG ModalDialog RID_PADIALOG { + HelpID = "padmin:ModalDialog:RID_PADIALOG"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 198 ) ; @@ -160,6 +168,7 @@ ModalDialog RID_PADIALOG }; CheckBox RID_PA_CB_CUPSUSAGE { + HelpID = "padmin:CheckBox:RID_PADIALOG:RID_PA_CB_CUPSUSAGE"; Pos = MAP_APPFONT( 12, 158 ); Size = MAP_APPFONT( 168, 8 ); Text [ en-US ] = "Disable CUPS Support"; @@ -186,6 +195,7 @@ ModalDialog RID_PADIALOG }; ListBox RID_PA_LB_DEV { + HelpID = "padmin:ListBox:RID_PADIALOG:RID_PA_LB_DEV"; Pos = MAP_APPFONT( 12, 15 ); Size = MAP_APPFONT( 168, 80 ); Border = TRUE; @@ -237,30 +247,35 @@ ModalDialog RID_PADIALOG }; PushButton RID_PA_BTN_CONF { + HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_CONF"; Pos = MAP_APPFONT( 190, 15 ); Size = MAP_APPFONT( 60, 12 ); Text [ en-US ] = "Properties..."; }; PushButton RID_PA_BTN_RENAME { + HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_RENAME"; Pos = MAP_APPFONT( 190, 32 ); Size = MAP_APPFONT( 60, 12 ); Text [ en-US ] = "R~ename..."; }; PushButton RID_PA_BTN_STD { + HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_STD"; Pos = MAP_APPFONT( 190, 49 ); Size = MAP_APPFONT( 60, 12 ); Text [ en-US ] = "~Default"; }; PushButton RID_PA_BTN_DEL { + HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_DEL"; Pos = MAP_APPFONT( 190, 66 ); Size = MAP_APPFONT( 60, 12 ); Text [ en-US ] = "Remo~ve..."; }; PushButton RID_PA_TESTPAGE { + HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_TESTPAGE"; Pos = MAP_APPFONT( 190, 83 ); Size = MAP_APPFONT( 60, 12 ); Text [ en-US ] = "Test ~Page"; @@ -268,12 +283,14 @@ ModalDialog RID_PADIALOG PushButton RID_PA_BTN_FONTS { + HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_FONTS"; Pos = MAP_APPFONT( 80, 181 ); Size = MAP_APPFONT( 70, 12 ); Text [ en-US ] = "Fon~ts..."; }; PushButton RID_PA_BTN_ADD { + HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_ADD"; Pos = MAP_APPFONT( 5, 181 ); Size = MAP_APPFONT( 70, 12 ); Text [ en-US ] = "New Printer..."; @@ -292,6 +309,7 @@ ModalDialog RID_PADIALOG ModalDialog RID_STRINGQUERYDLG { + HelpID = "padmin:ModalDialog:RID_STRINGQUERYDLG"; OutputSize = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( 10 , 10 ) ; @@ -306,12 +324,14 @@ ModalDialog RID_STRINGQUERYDLG }; Edit RID_STRQRY_EDT_NEWNAME { + HelpID = "padmin:Edit:RID_STRINGQUERYDLG:RID_STRQRY_EDT_NEWNAME"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 23 ) ; Size = MAP_APPFONT ( 130 , 12 ) ; }; ComboBox RID_STRQRY_BOX_NEWNAME { + HelpID = "padmin:ComboBox:RID_STRINGQUERYDLG:RID_STRQRY_BOX_NEWNAME"; Border = TRUE ; DropDown = TRUE; Pos = MAP_APPFONT ( 6 , 23 ) ; @@ -383,6 +403,7 @@ String RID_TXT_TESTPAGE_TIME ModalDialog RID_FONTNAMEDIALOG { + HelpID = "padmin:ModalDialog:RID_FONTNAMEDIALOG"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 255 , 110 ) ; @@ -397,24 +418,28 @@ ModalDialog RID_FONTNAMEDIALOG }; PushButton RID_FNTNM_BTN_RENAME { + HelpID = "padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_RENAME"; Pos = MAP_APPFONT( 196, 31 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "Re~name..."; }; PushButton RID_FNTNM_BTN_REMOVE { + HelpID = "padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_REMOVE"; Pos = MAP_APPFONT ( 196 , 48 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; Text [ en-US ] = "~Remove..."; }; PushButton RID_FNTNM_BTN_IMPORT { + HelpID = "padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_IMPORT"; Pos = MAP_APPFONT ( 196 , 65 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; Text [ en-US ] = "~Add..."; }; ListBox RID_FNTNM_LB_FONTS { + HelpID = "padmin:ListBox:RID_FONTNAMEDIALOG:RID_FNTNM_LB_FONTS"; Border = TRUE ; Sort = TRUE ; AutoHScroll = TRUE; @@ -541,6 +566,7 @@ String RID_AFMERROR_BOX_TXT ModelessDialog RID_PROGRESS_DLG { + HelpID = "padmin:ModelessDialog:RID_PROGRESS_DLG"; OutputSize = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( 10 , 10 ) ; @@ -586,6 +612,7 @@ String RID_OPERATION_CONVERTMETRIC ModalDialog RID_PPDIMPORT_DLG { + HelpID = "padmin:ModalDialog:RID_PPDIMPORT_DLG"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 265 , 225 ) ; @@ -606,6 +633,7 @@ ModalDialog RID_PPDIMPORT_DLG }; ComboBox RID_PPDIMP_LB_PATH { + HelpID = "padmin:ComboBox:RID_PPDIMPORT_DLG:RID_PPDIMP_LB_PATH"; Dropdown = TRUE; Border = TRUE; Sort = TRUE; @@ -615,6 +643,7 @@ ModalDialog RID_PPDIMPORT_DLG }; PushButton RID_PPDIMP_BTN_SEARCH { + HelpID = "padmin:PushButton:RID_PPDIMPORT_DLG:RID_PPDIMP_BTN_SEARCH"; Pos = MAP_APPFONT( 145, 15 ); Size = MAP_APPFONT( 50, 14 ); Text [ en-US ] = "Browse..."; @@ -628,6 +657,7 @@ ModalDialog RID_PPDIMPORT_DLG }; MultiListBox RID_PPDIMP_LB_DRIVER { + HelpID = "padmin:MultiListBox:RID_PPDIMPORT_DLG:RID_PPDIMP_LB_DRIVER"; Border = TRUE; Sort = TRUE; SimpleMode = TRUE; @@ -723,6 +753,7 @@ String RID_TXT_PRINTERADDFAILED ModalDialog RID_ADD_PRINTER_DIALOG { + HelpID = "padmin:ModalDialog:RID_ADD_PRINTER_DIALOG"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 240 , 172 ) ; @@ -752,12 +783,14 @@ ModalDialog RID_ADD_PRINTER_DIALOG }; PushButton RID_ADDP_BTN_NEXT { + HelpID = "padmin:PushButton:RID_ADD_PRINTER_DIALOG:RID_ADDP_BTN_NEXT"; Pos = MAP_APPFONT( 130, 155 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Next >>"; }; PushButton RID_ADDP_BTN_PREV { + HelpID = "padmin:PushButton:RID_ADD_PRINTER_DIALOG:RID_ADDP_BTN_PREV"; Pos = MAP_APPFONT( 75, 155 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "<< ~Back"; @@ -767,6 +800,7 @@ ModalDialog RID_ADD_PRINTER_DIALOG TabPage RID_ADDP_PAGE_CHOOSEDRIVER { + HelpID = "padmin:TabPage:RID_ADDP_PAGE_CHOOSEDRIVER"; Hide = TRUE; Pos = MAP_APPFONT( 0, 30 ); Size = MAP_APPFONT( 240, 120 ); @@ -782,6 +816,7 @@ TabPage RID_ADDP_PAGE_CHOOSEDRIVER }; ListBox RID_ADDP_CHDRV_BOX_DRIVER { + HelpID = "padmin:ListBox:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BOX_DRIVER"; Pos = MAP_APPFONT( 5, 15 ); Size = MAP_APPFONT( 175, 100 ); Border = TRUE; @@ -789,12 +824,14 @@ TabPage RID_ADDP_PAGE_CHOOSEDRIVER }; PushButton RID_ADDP_CHDRV_BTN_ADD { + HelpID = "padmin:PushButton:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BTN_ADD"; Pos = MAP_APPFONT( 185, 15 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Import..."; }; PushButton RID_ADDP_CHDRV_BTN_REMOVE { + HelpID = "padmin:PushButton:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BTN_REMOVE"; Pos = MAP_APPFONT( 185, 32 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Delete"; @@ -807,6 +844,7 @@ TabPage RID_ADDP_PAGE_CHOOSEDRIVER TabPage RID_ADDP_PAGE_CHOOSEDEV { + HelpID = "padmin:TabPage:RID_ADDP_PAGE_CHOOSEDEV"; Hide = TRUE; Pos = MAP_APPFONT( 0, 30 ); Size = MAP_APPFONT( 240, 120 ); @@ -822,24 +860,28 @@ TabPage RID_ADDP_PAGE_CHOOSEDEV }; RadioButton RID_ADDP_CHDEV_BTN_PRINTER { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_PRINTER"; Pos = MAP_APPFONT ( 40, 40 ); Size = MAP_APPFONT( 180, 10 ); Text [ en-US ] = "Add a ~printer"; }; RadioButton RID_ADDP_CHDEV_BTN_FAX { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_FAX"; Pos = MAP_APPFONT ( 40, 50 ); Size = MAP_APPFONT( 180, 10 ); Text [ en-US ] = "Connect a fa~x device"; }; RadioButton RID_ADDP_CHDEV_BTN_PDF { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_PDF"; Pos = MAP_APPFONT ( 40, 60 ); Size = MAP_APPFONT( 180, 10 ); Text [ en-US ] = "Connect a P~DF converter"; }; RadioButton RID_ADDP_CHDEV_BTN_OLD { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_OLD"; Pos = MAP_APPFONT ( 40, 70 ); Size = MAP_APPFONT( 180, 10 ); Text [ en-US ] = "~Import printers from a StarOffice installation"; @@ -848,6 +890,7 @@ TabPage RID_ADDP_PAGE_CHOOSEDEV TabPage RID_ADDP_PAGE_NAME { + HelpID = "padmin:TabPage:RID_ADDP_PAGE_NAME"; Hide = TRUE; Pos = MAP_APPFONT( 0, 30 ); Size = MAP_APPFONT( 240, 120 ); @@ -875,12 +918,14 @@ TabPage RID_ADDP_PAGE_NAME }; Edit RID_ADDP_NAME_EDT_NAME { + HelpID = "padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_NAME"; Pos = MAP_APPFONT( 40, 35 ); Size = MAP_APPFONT( 160, 12 ); Border = TRUE; }; Edit RID_ADDP_NAME_EDT_FAXNAME { + HelpID = "padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_FAXNAME"; Pos = MAP_APPFONT( 40, 35 ); Size = MAP_APPFONT( 160, 12 ); Border = TRUE; @@ -888,6 +933,7 @@ TabPage RID_ADDP_PAGE_NAME }; Edit RID_ADDP_NAME_EDT_PDFNAME { + HelpID = "padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_PDFNAME"; Pos = MAP_APPFONT( 40, 35 ); Size = MAP_APPFONT( 160, 12 ); Border = TRUE; @@ -895,12 +941,14 @@ TabPage RID_ADDP_PAGE_NAME }; CheckBox RID_ADDP_NAME_BOX_DEFAULT { + HelpID = "padmin:CheckBox:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_BOX_DEFAULT"; Pos = MAP_APPFONT( 40, 50 ); Size = MAP_APPFONT( 160, 12 ); Text [ en-US ] = "~Use as default printer"; }; CheckBox RID_ADDP_NAME_BOX_FAXSWALLOW { + HelpID = "padmin:CheckBox:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_BOX_FAXSWALLOW"; Pos = MAP_APPFONT( 40, 50 ); Size = MAP_APPFONT( 160, 12 ); Text [ en-US ] = "Remo~ve fax number from output"; @@ -909,6 +957,7 @@ TabPage RID_ADDP_PAGE_NAME TabPage RID_ADDP_PAGE_COMMAND { + HelpID = "padmin:TabPage:RID_ADDP_PAGE_COMMAND"; Hide = TRUE; Pos = MAP_APPFONT( 0, 30 ); Size = MAP_APPFONT( 240, 120 ); @@ -925,12 +974,14 @@ TabPage RID_ADDP_PAGE_COMMAND }; ComboBox RID_ADDP_CMD_BOX_COMMAND { + HelpID = "padmin:ComboBox:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BOX_COMMAND"; Pos = MAP_APPFONT( 10, 30); Size = MAP_APPFONT( 220, 85 ); Border = TRUE; }; ComboBox RID_ADDP_CMD_BOX_PDFCOMMAND { + HelpID = "padmin:ComboBox:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BOX_PDFCOMMAND"; Pos = MAP_APPFONT( 10, 30); Size = MAP_APPFONT( 220, 60 ); Border = TRUE; @@ -943,18 +994,21 @@ TabPage RID_ADDP_PAGE_COMMAND }; Edit RID_ADDP_CMD_EDT_PDFDIR { + HelpID = "padmin:Edit:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_EDT_PDFDIR"; Border = TRUE; Pos = MAP_APPFONT( 10, 104 ); Size = MAP_APPFONT( 190, 12 ); }; PushButton RID_ADDP_CMD_BTN_PDFDIR { + HelpID = "padmin:PushButton:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BTN_PDFDIR"; Pos = MAP_APPFONT( 205, 104 ); Size = MAP_APPFONT( 25, 12 ); Text = "~..."; }; PushButton RID_ADDP_CMD_BTN_HELP { + HelpID = "padmin:PushButton:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BTN_HELP"; Pos = MAP_APPFONT( 180, 2 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Help"; @@ -971,6 +1025,7 @@ TabPage RID_ADDP_PAGE_COMMAND TabPage RID_ADDP_PAGE_OLDPRINTERS { + HelpID = "padmin:TabPage:RID_ADDP_PAGE_OLDPRINTERS"; Hide = TRUE; Pos = MAP_APPFONT( 0, 30 ); Size = MAP_APPFONT( 240, 120 ); @@ -987,12 +1042,14 @@ TabPage RID_ADDP_PAGE_OLDPRINTERS }; MultiListBox RID_ADDP_OLD_BOX_PRINTERS { + HelpID = "padmin:MultiListBox:RID_ADDP_PAGE_OLDPRINTERS:RID_ADDP_OLD_BOX_PRINTERS"; Pos = MAP_APPFONT( 10, 35 ); Size = MAP_APPFONT( 165, 80 ); Border = TRUE; }; PushButton RID_ADDP_OLD_BTN_SELECTALL { + HelpID = "padmin:PushButton:RID_ADDP_PAGE_OLDPRINTERS:RID_ADDP_OLD_BTN_SELECTALL"; Pos = MAP_APPFONT( 180, 35 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Select All"; @@ -1001,6 +1058,7 @@ TabPage RID_ADDP_PAGE_OLDPRINTERS TabPage RID_ADDP_PAGE_FAXDRIVER { + HelpID = "padmin:TabPage:RID_ADDP_PAGE_FAXDRIVER"; Hide = TRUE; Pos = MAP_APPFONT( 0, 30 ); Size = MAP_APPFONT( 240, 120 ); @@ -1017,12 +1075,14 @@ TabPage RID_ADDP_PAGE_FAXDRIVER }; RadioButton RID_ADDP_FAXDRV_BTN_DEFAULT { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_FAXDRIVER:RID_ADDP_FAXDRV_BTN_DEFAULT"; Pos = MAP_APPFONT( 40,40 ); Size = MAP_APPFONT( 160, 10 ); Text [ en-US ] = "T~he default driver"; }; RadioButton RID_ADDP_FAXDRV_BTN_SELECT { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_FAXDRIVER:RID_ADDP_FAXDRV_BTN_SELECT"; Pos = MAP_APPFONT( 40, 50 ); Size = MAP_APPFONT( 160,24 ); Text [ en-US ] = "A speci~fic driver, to adapt the format to another printer"; @@ -1031,6 +1091,7 @@ TabPage RID_ADDP_PAGE_FAXDRIVER TabPage RID_ADDP_PAGE_PDFDRIVER { + HelpID = "padmin:TabPage:RID_ADDP_PAGE_PDFDRIVER"; Hide = TRUE; Pos = MAP_APPFONT( 0, 30 ); Size = MAP_APPFONT( 240, 120 ); @@ -1047,18 +1108,21 @@ TabPage RID_ADDP_PAGE_PDFDRIVER }; RadioButton RID_ADDP_PDFDRV_BTN_DEFAULT { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_PDFDRIVER:RID_ADDP_PDFDRV_BTN_DEFAULT"; Pos = MAP_APPFONT( 40, 40 ); Size = MAP_APPFONT( 160, 10 ); Text [ en-US ] = "T~he default driver"; }; RadioButton RID_ADDP_PDFDRV_BTN_DIST { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_PDFDRIVER:RID_ADDP_PDFDRV_BTN_DIST"; Pos = MAP_APPFONT( 40,50 ); Size = MAP_APPFONT( 160, 10 ); Text [ en-US ] = "The Adobe D~istiller(tm) driver"; }; RadioButton RID_ADDP_PDFDRV_BTN_SELECT { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_PDFDRIVER:RID_ADDP_PDFDRV_BTN_SELECT"; Pos = MAP_APPFONT( 40, 60 ); Size = MAP_APPFONT( 160, 24 ); Text [ en-US ] = "A spec~ific driver, to adapt the format to another printer"; diff --git a/padmin/source/rtsetup.src b/padmin/source/rtsetup.src index e2e9a4c8aea3..38f3bf224a13 100644 --- a/padmin/source/rtsetup.src +++ b/padmin/source/rtsetup.src @@ -78,6 +78,7 @@ TabDialog RID_RTS_RTSDIALOG TabPage RID_RTS_PAPERPAGE { + HelpID = "padmin:TabPage:RID_RTS_PAPERPAGE"; Hide = TRUE; Size = MAP_APPFONT( 230, 175 ); FixedText RID_RTS_PAPER_PAPER_TXT @@ -88,6 +89,7 @@ TabPage RID_RTS_PAPERPAGE }; ListBox RID_RTS_PAPER_PAPER_BOX { + HelpID = "padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_PAPER_BOX"; Border = TRUE; DropDown = TRUE; Pos = MAP_APPFONT( 115, 5 ); @@ -101,6 +103,7 @@ TabPage RID_RTS_PAPERPAGE }; ListBox RID_RTS_PAPER_ORIENTATION_BOX { + HelpID = "padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_ORIENTATION_BOX"; Border = TRUE; DropDown = TRUE; Pos = MAP_APPFONT( 115, 20 ); @@ -114,6 +117,7 @@ TabPage RID_RTS_PAPERPAGE }; ListBox RID_RTS_PAPER_DUPLEX_BOX { + HelpID = "padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_DUPLEX_BOX"; Border = TRUE; DropDown = TRUE; Pos = MAP_APPFONT( 115, 35 ); @@ -127,6 +131,7 @@ TabPage RID_RTS_PAPERPAGE }; ListBox RID_RTS_PAPER_SLOT_BOX { + HelpID = "padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_SLOT_BOX"; Border = TRUE; DropDown = TRUE; Pos = MAP_APPFONT( 115, 50 ); @@ -136,6 +141,7 @@ TabPage RID_RTS_PAPERPAGE TabPage RID_RTS_DEVICEPAGE { + HelpID = "padmin:TabPage:RID_RTS_DEVICEPAGE"; Hide = TRUE; Size = MAP_APPFONT( 230, 175 ); @@ -156,6 +162,7 @@ TabPage RID_RTS_DEVICEPAGE }; ListBox RID_RTS_DEVICE_PPDKEY_BOX { + HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_PPDKEY_BOX"; Border = TRUE; Pos = MAP_APPFONT( 5, 14 ); Size = MAP_APPFONT( 105, 111 ); @@ -168,6 +175,7 @@ TabPage RID_RTS_DEVICEPAGE }; ListBox RID_RTS_DEVICE_PPDVALUE_BOX { + HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_PPDVALUE_BOX"; Border = TRUE; Pos = MAP_APPFONT( 120, 14 ); Size = MAP_APPFONT( 105, 111 ); @@ -181,6 +189,7 @@ TabPage RID_RTS_DEVICEPAGE }; ListBox RID_RTS_DEVICE_PRINTLANG_BOX { + HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_LEVEL_BOX"; DropDown = TRUE; Pos = MAP_APPFONT( 120, 130 ); Size = MAP_APPFONT( 105, 200 ); @@ -201,6 +210,7 @@ TabPage RID_RTS_DEVICEPAGE }; ListBox RID_RTS_DEVICE_SPACE_BOX { + HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_SPACE_BOX"; DropDown = TRUE; Pos = MAP_APPFONT( 120, 145 ); Size = MAP_APPFONT( 105, 200 ); @@ -213,6 +223,7 @@ TabPage RID_RTS_DEVICEPAGE }; ListBox RID_RTS_DEVICE_DEPTH_BOX { + HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_DEPTH_BOX"; DropDown = TRUE; Pos = MAP_APPFONT( 120, 160 ); Size = MAP_APPFONT( 105, 200 ); @@ -226,11 +237,13 @@ TabPage RID_RTS_DEVICEPAGE TabPage RID_RTS_FONTSUBSTPAGE { + HelpID = "padmin:TabPage:RID_RTS_FONTSUBSTPAGE"; Hide = TRUE; Size = MAP_APPFONT( 230, 175 ); CheckBox RID_RTS_FS_ENABLE_BTN { + HelpID = "padmin:CheckBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_ENABLE_BTN"; Pos = MAP_APPFONT( 5, 5 ); Size = MAP_APPFONT( 180, 10 ); Text [ en-US ] = "~Enable font replacement"; @@ -244,6 +257,7 @@ TabPage RID_RTS_FONTSUBSTPAGE }; MultiListBox RID_RTS_FS_SUBST_BOX { + HelpID = "padmin:MultiListBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_SUBST_BOX"; AutoHScroll = TRUE; Border = TRUE; Sort = TRUE; @@ -253,12 +267,14 @@ TabPage RID_RTS_FONTSUBSTPAGE }; PushButton RID_RTS_FS_ADD_BTN { + HelpID = "padmin:PushButton:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_ADD_BTN"; Pos = MAP_APPFONT( 5, 125 ); Size = MAP_APPFONT( 107, 12 ); Text [ en-US ] = "~Add"; }; PushButton RID_RTS_FS_REMOVE_BTN { + HelpID = "padmin:PushButton:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_REMOVE_BTN"; Pos = MAP_APPFONT( 117, 125 ); Size = MAP_APPFONT( 107, 12 ); Text [ en-US ] = "~Remove"; @@ -271,6 +287,7 @@ TabPage RID_RTS_FONTSUBSTPAGE }; ComboBox RID_RTS_FS_FROM_BOX { + HelpID = "padmin:ComboBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_FROM_BOX"; Border = TRUE; DropDown = TRUE; Sort = TRUE; @@ -285,6 +302,7 @@ TabPage RID_RTS_FONTSUBSTPAGE }; ListBox RID_RTS_FS_TO_BOX { + HelpID = "padmin:ListBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_TO_BOX"; Border = TRUE; DropDown = TRUE; Sort = TRUE; @@ -295,11 +313,13 @@ TabPage RID_RTS_FONTSUBSTPAGE TabPage RID_RTS_COMMANDPAGE { + HelpID = "padmin:TabPage:RID_RTS_COMMANDPAGE"; Hide = TRUE; Size = MAP_APPFONT( 230, 175 ); ComboBox RID_RTS_CMD_CB_COMMANDS { + HelpID = "padmin:ComboBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_CB_COMMANDS"; Border = TRUE ; Sort = TRUE ; Dropdown = TRUE; @@ -308,6 +328,7 @@ TabPage RID_RTS_COMMANDPAGE }; CheckBox RID_RTS_CMD_CB_EXTERNAL { + HelpID = "padmin:CheckBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_CB_EXTERNAL"; Pos = MAP_APPFONT( 11, 95 ); Size = MAP_APPFONT( 220, 10 ); Text [ en-US ] = "~Use system print dialog, disable %PRODUCTNAME's print dialog"; @@ -321,6 +342,7 @@ TabPage RID_RTS_COMMANDPAGE }; ComboBox RIT_RTS_CMD_CB_QUICKCMD { + HelpID = "padmin:ComboBox:RID_RTS_COMMANDPAGE:RIT_RTS_CMD_CB_QUICKCMD"; Border = TRUE; Sort = TRUE; Dropdown = TRUE; @@ -348,6 +370,7 @@ TabPage RID_RTS_COMMANDPAGE ListBox RID_RTS_CMD_LB_CONFIGURE { + HelpID = "padmin:ListBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_LB_CONFIGURE"; DropDown = true; Border = true; Pos = MAP_APPFONT( 101, 56 ); @@ -362,6 +385,7 @@ TabPage RID_RTS_COMMANDPAGE CheckBox RID_RTS_CMD_BOX_SWALLOWFAXNO { + HelpID = "padmin:CheckBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BOX_SWALLOWFAXNO"; Pos = MAP_APPFONT( 11, 146 ); Size = MAP_APPFONT( 130, 8 ); Text [ en-US ] = "~Fax number will be removed from output"; @@ -374,12 +398,14 @@ TabPage RID_RTS_COMMANDPAGE }; Edit RID_RTS_CMD_EDT_PDFDIR { + HelpID = "padmin:Edit:RID_RTS_COMMANDPAGE:RID_RTS_CMD_EDT_PDFDIR"; Border = TRUE; Pos = MAP_APPFONT( 11, 155 ); Size = MAP_APPFONT( 130, 12 ); }; PushButton RID_RTS_CMD_BTN_PDFDIR { + HelpID = "padmin:PushButton:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BTN_PDFDIR"; Pos = MAP_APPFONT( 146, 155 ); Size = MAP_APPFONT( 15, 12 ); Text = "..."; @@ -403,12 +429,14 @@ TabPage RID_RTS_COMMANDPAGE }; PushButton RID_RTS_CMD_BTN_HELP { + HelpID = "padmin:PushButton:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BTN_HELP"; Pos = MAP_APPFONT( 170, 55 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Help"; }; PushButton RID_RTS_CMD_BTN_REMOVE { + HelpID = "padmin:PushButton:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BTN_REMOVE"; Pos = MAP_APPFONT( 170, 72 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Remove"; @@ -429,6 +457,7 @@ TabPage RID_RTS_COMMANDPAGE TabPage RID_RTS_OTHERPAGE { + HelpID = "padmin:TabPage:RID_RTS_OTHERPAGE"; Hide = TRUE; Size = MAP_APPFONT( 230, 175 ); @@ -440,6 +469,7 @@ TabPage RID_RTS_OTHERPAGE }; MetricField RID_RTS_OTHER_LEFTMARGIN_BOX { + HelpID = "padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_LEFTMARGIN_BOX"; Border = TRUE ; Pos = MAP_APPFONT ( 100 , 5 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -456,6 +486,7 @@ TabPage RID_RTS_OTHERPAGE }; MetricField RID_RTS_OTHER_TOPMARGIN_BOX { + HelpID = "padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_TOPMARGIN_BOX"; Border = TRUE ; Pos = MAP_APPFONT ( 100 , 20 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -472,6 +503,7 @@ TabPage RID_RTS_OTHERPAGE }; MetricField RID_RTS_OTHER_RIGHTMARGIN_BOX { + HelpID = "padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_RIGHTMARGIN_BOX"; Border = TRUE ; Pos = MAP_APPFONT ( 100 , 35 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -488,6 +520,7 @@ TabPage RID_RTS_OTHERPAGE }; MetricField RID_RTS_OTHER_BOTTOMMARGIN_BOX { + HelpID = "padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_BOTTOMMARGIN_BOX"; Border = TRUE ; Pos = MAP_APPFONT ( 100 , 50 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -504,12 +537,14 @@ TabPage RID_RTS_OTHERPAGE }; Edit RID_RTS_OTHER_COMMENT_EDT { + HelpID = "padmin:Edit:RID_RTS_OTHERPAGE:RID_RTS_OTHER_COMMENT_EDT"; Border = TRUE ; Pos = MAP_APPFONT ( 5 , 75 ) ; Size = MAP_APPFONT ( 220 , 12 ) ; }; PushButton RID_RTS_OTHER_DEFAULT_BTN { + HelpID = "padmin:PushButton:RID_RTS_OTHERPAGE:RID_RTS_OTHER_DEFAULT_BTN"; Pos = MAP_APPFONT( 175, 5 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Default"; @@ -523,6 +558,7 @@ String RID_TXT_QUERYFAXNUMBER ModalDialog RID_RTS_PWDIALOG { + HelpID = "padmin:ModalDialog:RID_RTS_PWDIALOG"; Text [ en-US ] = "Authentication request"; OutputSize = TRUE ; SVLook = TRUE ; @@ -545,6 +581,7 @@ ModalDialog RID_RTS_PWDIALOG }; Edit RID_RTS_PWDIALOG_USER_EDT { + HelpID = "padmin:Edit:RID_RTS_PWDIALOG:RID_RTS_PWDIALOG_USER_EDT"; Pos = MAP_APPFONT( 70, 29 ); Size = MAP_APPFONT( 75, 12 ); Border = TRUE; @@ -557,6 +594,7 @@ ModalDialog RID_RTS_PWDIALOG }; Edit RID_RTS_PWDIALOG_PASS_EDT { + HelpID = "padmin:Edit:RID_RTS_PWDIALOG:RID_RTS_PWDIALOG_PASS_EDT"; Pos = MAP_APPFONT( 70, 44 ); Size = MAP_APPFONT( 75, 12 ); Border = TRUE; diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 1d5af35de9ff..51461cf356d6 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -285,6 +285,7 @@ public: RscRange a0to9999Short; RscIdRange aIdLong; RscString aString; + RscString aStringLiteral; RscFlag aWinBits; RscLangEnum aLangType; RscLangArray aLangString; diff --git a/rsc/inc/vclrsc.hxx b/rsc/inc/vclrsc.hxx index 19677171dcb2..d4084f2bc239 100644 --- a/rsc/inc/vclrsc.hxx +++ b/rsc/inc/vclrsc.hxx @@ -162,9 +162,11 @@ typedef sal_Int64 WinBits; // - Help-Types - // -------------- +#if 0 // from vcl/inc/help.hxx -#define OOO_HELP_INDEX ((ULONG)0xFFFFFFFF) -#define OOO_HELP_HELPONHELP ((ULONG)0xFFFFFFFE) +#define OOO_HELP_INDEX ".help:index" +#define OOO_HELP_HELPONHELP ".help:helponhelp" +#endif // -------------- // - FieldTypes - diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index 97d23d4e3b53..05f7210fd357 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -81,6 +81,7 @@ RscTypCont :: RscTypCont( RscError * pErrHdl, a0to9999Short( pHS->getID( "YearShort" ), RSC_NOTYPE ), aIdLong( pHS->getID( "IDLONG" ), RSC_NOTYPE ), aString( pHS->getID( "Chars" ), RSC_NOTYPE ), + aStringLiteral( pHS->getID( "Chars" ), RSC_NOTYPE ), aWinBits( pHS->getID( "WinBits" ), RSC_NOTYPE ), aLangType(), aLangString( pHS->getID( "Lang_Chars" ), RSC_NOTYPE, &aString, &aLangType ), @@ -125,7 +126,7 @@ static sal_uInt32 getLangIdAndShortenLocale( RscTypCont* pTypCont, else rLang = rtl::OString(); #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, " %s (0x%hx)", aL.getStr(), nRet ); + fprintf( stderr, " %s (0x%hx)", aL.getStr(), (int)nRet ); #endif return nRet; } diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 625417769f45..1942711a4a47 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -297,7 +297,7 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, InsWinBit( pClassWindow, "DialogControl", nTabControlId ); nId = aNmTb.Put( "HelpID", VARNAME ); - pClassWindow->SetVariable( nId, &aIdLong ); + pClassWindow->SetVariable( nId, &aStringLiteral, NULL, 0, WINDOW_HELPID ); nRsc_XYMAPMODEId = nId = aNmTb.Put( "_XYMapMode", VARNAME ); @@ -325,7 +325,7 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, nId = aNmTb.Put( "ExtraLong", VARNAME ); pClassWindow->SetVariable( nId, &aLong, NULL, 0, WINDOW_EXTRALONG ); nId = aNmTb.Put( "UniqueId", VARNAME ); - pClassWindow->SetVariable( nId, &aLong, NULL, 0, WINDOW_UNIQUEID ); + pClassWindow->SetVariable( nId, &aString, NULL, 0, WINDOW_UNIQUEID ); // BorderStyle RscEnum* pBorderStyleEnum = new RscEnum( pHS->getID( "WindowBorderStyle" ), RSC_NOTYPE ); @@ -1201,7 +1201,7 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper, pClassMenuItem->SetVariable( nId, &aLangString, NULL, 0, RSC_MENUITEM_HELPTEXT ); nId = aNmTb.Put( "HelpID", VARNAME ); - pClassMenuItem->SetVariable( nId, &aIdLong, NULL, 0, + pClassMenuItem->SetVariable( nId, &aStringLiteral, NULL, 0, RSC_MENUITEM_HELPID ); nId = aNmTb.Put( "AccelKey", VARNAME ); pClassMenuItem->SetVariable( nId, pClassKeyCode, NULL, 0, @@ -1276,7 +1276,7 @@ RscTop * RscTypCont::InitClassMessBox( RscTop * pSuper, nId = aNmTb.Put( "DefButton", VARNAME ); pClassMessBox->SetVariable( nId, pMessDefButton ); nId = aNmTb.Put( "HelpID", VARNAME ); - pClassMessBox->SetVariable( nId, &aIdLong ); + pClassMessBox->SetVariable( nId, &aStringLiteral ); nId = aNmTb.Put( "SysModal", VARNAME ); pClassMessBox->SetVariable( nId, &aBool ); nId = aNmTb.Put( "Title", VARNAME ); @@ -2015,7 +2015,7 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper, pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId ); } nId = aNmTb.Put( "HelpID", VARNAME ); - pClassToolBoxItem->SetVariable( nId, &aIdLong, NULL, 0, + pClassToolBoxItem->SetVariable( nId, &aStringLiteral, NULL, 0, RSC_TOOLBOXITEM_HELPID ); nId = aNmTb.Put( "Text", VARNAME ); pClassToolBoxItem->SetVariable( nId, &aLangString, NULL, 0, diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index a763b92f0bb1..54a56a3840d2 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -210,9 +210,11 @@ void RscTypCont::Init() aNmTb.Put( "TRUE", BOOLEAN, (long)TRUE ); aNmTb.Put( "FALSE", BOOLEAN, (long)FALSE ); + #if 0 /* Vordefinierte HilfeId's */ aNmTb.Put( "HELP_INDEX", NUMBER, OOO_HELP_INDEX ); aNmTb.Put( "HELP_HELPONHELP", NUMBER, OOO_HELP_HELPONHELP ); + #endif aNmTb.Put( "XSCALE", XSCALE , (long)0 ); aNmTb.Put( "YSCALE", YSCALE , (long)0 ); diff --git a/svl/inc/pickerhelper.hxx b/svl/inc/pickerhelper.hxx deleted file mode 100644 index 307031b578d1..000000000000 --- a/svl/inc/pickerhelper.hxx +++ /dev/null @@ -1,69 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _PICKERHELPER_HXX -#define _PICKERHELPER_HXX - -#include "svl/svldllapi.h" -#include "sal/types.h" -#include "com/sun/star/uno/Reference.hxx" - -namespace com -{ - namespace sun - { - namespace star - { - namespace ui - { - namespace dialogs - { - class XFilePicker; - class XFolderPicker; - } - } - } - } -} - - -namespace svt -{ - - SVL_DLLPUBLIC void SetDialogHelpId( - ::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFilePicker > _mxFileDlg, - sal_Int32 _nHelpId ); - - SVL_DLLPUBLIC void SetDialogHelpId( - ::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFolderPicker > _mxFileDlg, - sal_Int32 _nHelpId ); - -} - -//----------------------------------------------------------------------------- - -#endif diff --git a/svl/source/filepicker/makefile.mk b/svl/source/filepicker/makefile.mk index a4c97ea41aa1..b3c2a829cf54 100644 --- a/svl/source/filepicker/makefile.mk +++ b/svl/source/filepicker/makefile.mk @@ -38,7 +38,6 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------------- SLOFILES =\ - $(SLO)$/pickerhelper.obj \ $(SLO)$/pickerhistory.obj # --- Targets ------------------------------------------------------- diff --git a/svl/source/filepicker/pickerhelper.cxx b/svl/source/filepicker/pickerhelper.cxx deleted file mode 100644 index 72096c1bc56a..000000000000 --- a/svl/source/filepicker/pickerhelper.cxx +++ /dev/null @@ -1,99 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svl.hxx" - -#include "pickerhelper.hxx" -#include "rtl/ustring.hxx" -#include "com/sun/star/ui/dialogs/XFilePicker.hpp" -#include "com/sun/star/ui/dialogs/XFolderPicker.hpp" -#include "com/sun/star/beans/XPropertySet.hpp" -#include "com/sun/star/beans/XPropertySetInfo.hpp" -#include "com/sun/star/uno/Any.hxx" -#include "tools/debug.hxx" - -namespace css = com::sun::star; - -using css::uno::Reference; -using rtl::OUString; - -namespace svt -{ - void SetDialogHelpId( - Reference < css::ui::dialogs::XFilePicker > _mxFileDlg, sal_Int32 _nHelpId ) - { - try - { - // does the dialog haver a help URL property? - Reference< css::beans::XPropertySet > xDialogProps( _mxFileDlg, css::uno::UNO_QUERY ); - Reference< css::beans::XPropertySetInfo > xInfo; - if( xDialogProps.is() ) - xInfo = xDialogProps->getPropertySetInfo( ); - - const OUString sHelpURLPropertyName( RTL_CONSTASCII_USTRINGPARAM( "HelpURL" ) ); - - if( xInfo.is() && xInfo->hasPropertyByName( sHelpURLPropertyName ) ) - { // yep - OUString sId( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) ); - sId += OUString::valueOf( _nHelpId ); - xDialogProps->setPropertyValue( sHelpURLPropertyName, css::uno::makeAny( sId ) ); - } - } - catch( const css::uno::Exception& ) - { - DBG_ERROR( "svt::SetDialogHelpId(): caught an exception while setting the help id!" ); - } - } - - void SetDialogHelpId( - Reference< css::ui::dialogs::XFolderPicker > _mxFileDlg, sal_Int32 _nHelpId ) - { - try - { - // does the dialog haver a help URL property? - Reference< css::beans::XPropertySet > xDialogProps( _mxFileDlg, css::uno::UNO_QUERY ); - Reference< css::beans::XPropertySetInfo > xInfo; - if( xDialogProps.is() ) - xInfo = xDialogProps->getPropertySetInfo( ); - - const OUString sHelpURLPropertyName( RTL_CONSTASCII_USTRINGPARAM( "HelpURL" ) ); - - if( xInfo.is() && xInfo->hasPropertyByName( sHelpURLPropertyName ) ) - { // yep - OUString sId( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) ); - sId += OUString::valueOf( _nHelpId ); - xDialogProps->setPropertyValue( sHelpURLPropertyName, css::uno::makeAny( sId ) ); - } - } - catch( const css::uno::Exception& ) - { - DBG_ERROR( "svt::SetDialogHelpId(): caught an exception while setting the help id!" ); - } - } -} - diff --git a/svtools/bmpmaker/bmp.src b/svtools/bmpmaker/bmp.src index 7431d2e335a4..30ff9488a805 100644 --- a/svtools/bmpmaker/bmp.src +++ b/svtools/bmpmaker/bmp.src @@ -27,6 +27,7 @@ #include "bmp.hrc" ModalDialog DLG_PATH { + HelpID = "svtools:ModalDialog:DLG_PATH"; OutputSize = TRUE; SVLook = TRUE; Size = MAP_APPFONT( 301, 104 ); @@ -54,36 +55,42 @@ ModalDialog DLG_PATH { Text = "Bitmap-Pfad:"; }; Edit EDT_SRS { + HelpID = "svtools:Edit:DLG_PATH:EDT_SRS"; Border = TRUE; Pos = MAP_APPFONT( 65, 14 ); Size = MAP_APPFONT( 160, 12 ); TabStop = TRUE; }; Edit EDT_RES { + HelpID = "svtools:Edit:DLG_PATH:EDT_RES"; Border = TRUE; Pos = MAP_APPFONT( 65, 29 ); Size = MAP_APPFONT( 160, 12 ); TabStop = TRUE; }; Edit EDT_OUT { + HelpID = "svtools:Edit:DLG_PATH:EDT_OUT"; Border = TRUE; Pos = MAP_APPFONT( 65, 44 ); Size = MAP_APPFONT( 160, 12 ); TabStop = TRUE; }; PushButton BTN_SRS { + HelpID = "svtools:PushButton:DLG_PATH:BTN_SRS"; Pos = MAP_APPFONT( 228, 14 ); Size = MAP_APPFONT( 15, 12 ); Text = "..."; TabStop = TRUE; }; PushButton BTN_RES { + HelpID = "svtools:PushButton:DLG_PATH:BTN_RES"; Pos = MAP_APPFONT( 228, 29 ); Size = MAP_APPFONT( 15, 12 ); Text = "..."; TabStop = TRUE; }; PushButton BTN_OUT { + HelpID = "svtools:PushButton:DLG_PATH:BTN_OUT"; Pos = MAP_APPFONT( 228, 44 ); Size = MAP_APPFONT( 15, 12 ); Text = "..."; @@ -106,6 +113,7 @@ ModalDialog DLG_PATH { Text = "Sprache"; }; ListBox LB_LANG { + HelpID = "svtools:ListBox:DLG_PATH:LB_LANG"; Border = TRUE; Pos = MAP_APPFONT( 12, 76 ); Size = MAP_APPFONT( 231, 70 ); diff --git a/svtools/inc/fileview.hxx b/svtools/inc/fileview.hxx index 74476541dcd8..db704a0e6784 100644 --- a/svtools/inc/fileview.hxx +++ b/svtools/inc/fileview.hxx @@ -104,8 +104,8 @@ public: sal_Bool GetParentURL( String& _rParentURL ) const; sal_Bool CreateNewFolder( const String& rNewFolder ); - void SetHelpId( sal_uInt32 nHelpId ); - sal_uInt32 GetHelpId( ) const; + void SetHelpId( const rtl::OString& rHelpId ); + const rtl::OString& GetHelpId( ) const; void SetSizePixel( const Size& rNewSize ); using Window::SetPosSizePixel; virtual void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); diff --git a/svtools/inc/svtools/headbar.hxx b/svtools/inc/svtools/headbar.hxx index 1ef7687cfb1d..c225a95d1f55 100644 --- a/svtools/inc/svtools/headbar.hxx +++ b/svtools/inc/svtools/headbar.hxx @@ -360,15 +360,15 @@ public: void SetHelpText( USHORT nItemId, const XubString& rText ); XubString GetHelpText( USHORT nItemId ) const; - void SetHelpId( USHORT nItemId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nItemId ) const; + void SetHelpId( USHORT nItemId, const rtl::OString& nHelpId ); + rtl::OString GetHelpId( USHORT nItemId ) const; Size CalcWindowSizePixel() const; inline void SetHelpText( const String& rText ) { Window::SetHelpText( rText ); } inline const String& GetHelpText() const { return Window::GetHelpText(); } - inline void SetHelpId( ULONG nId ) { Window::SetHelpId( nId ); } - inline ULONG GetHelpId() const { return Window::GetHelpId(); } + inline void SetHelpId( const rtl::OString& rId ) { Window::SetHelpId( rId ); } + inline const rtl::OString& GetHelpId() const { return Window::GetHelpId(); } inline void SetStartDragHdl( const Link& rLink ) { maStartDragHdl = rLink; } inline const Link& GetStartDragHdl() const { return maStartDragHdl; } diff --git a/svtools/inc/svtools/helpid.hrc b/svtools/inc/svtools/helpid.hrc index 1ffb7a99fb32..ecf8ba4b1bf7 100644 --- a/svtools/inc/svtools/helpid.hrc +++ b/svtools/inc/svtools/helpid.hrc @@ -28,90 +28,103 @@ #ifndef _SVT_HELPID_HRC #define _SVT_HELPID_HRC -// include --------------------------------------------------------------- - -#include <svl/solar.hrc> - -// Help-Ids -------------------------------------------------------------- - -#define HID_FILEDLG_OPENDLG (HID_SVTOOLS_START + 0) -#define HID_FILEDLG_PATHDLG (HID_SVTOOLS_START + 1) -#define HID_FILEDLG_DIR (HID_SVTOOLS_START + 2) -#define HID_FILEDLG_EDIT (HID_SVTOOLS_START + 3) -#define HID_FILEDLG_DIRS (HID_SVTOOLS_START + 4) -#define HID_FILEDLG_DRIVE (HID_SVTOOLS_START + 5) -#define HID_FILEDLG_DRIVES (HID_SVTOOLS_START + 6) -#define HID_FILEDLG_NEWDIR (HID_SVTOOLS_START + 7) -#define HID_FILEDLG_HOME (HID_SVTOOLS_START + 8) -#define HID_FILEDLG_FILE (HID_SVTOOLS_START + 9) -#define HID_FILEDLG_FILES (HID_SVTOOLS_START + 10) -#define HID_FILEDLG_PATH (HID_SVTOOLS_START + 11) -#define HID_FILEDLG_TYPE (HID_SVTOOLS_START + 12) -#define HID_FILEDLG_TYPES (HID_SVTOOLS_START + 13) +#define HID_FILEDLG_OPENDLG "SVT_HID_FILEDLG_OPENDLG" +#define HID_FILEDLG_PATHDLG "SVT_HID_FILEDLG_PATHDLG" +#define HID_FILEDLG_DIR "SVT_HID_FILEDLG_DIR" +#define HID_FILEDLG_EDIT "SVT_HID_FILEDLG_EDIT" +#define HID_FILEDLG_DIRS "SVT_HID_FILEDLG_DIRS" +#define HID_FILEDLG_DRIVE "SVT_HID_FILEDLG_DRIVE" +#define HID_FILEDLG_DRIVES "SVT_HID_FILEDLG_DRIVES" +#define HID_FILEDLG_NEWDIR "SVT_HID_FILEDLG_NEWDIR" +#define HID_FILEDLG_HOME "SVT_HID_FILEDLG_HOME" +#define HID_FILEDLG_FILE "SVT_HID_FILEDLG_FILE" +#define HID_FILEDLG_FILES "SVT_HID_FILEDLG_FILES" +#define HID_FILEDLG_PATH "SVT_HID_FILEDLG_PATH" +#define HID_FILEDLG_TYPE "SVT_HID_FILEDLG_TYPE" +#define HID_FILEDLG_TYPES "SVT_HID_FILEDLG_TYPES" +#define HID_FILEDLG_LINK_CB "SVT_HID_FILEDLG_LINK_CB" +#define HID_FILEDLG_PREVIEW_CB "SVT_HID_FILEDLG_PREVIEW_CB" +#define HID_FILEDLG_STANDARD "SVT_HID_FILEDLG_STANDARD" +#define HID_FILEDLG_MANAGER "SVT_HID_FILEDLG_MANAGER" +#define HID_FILEDLG_URL "SVT_HID_FILEDLG_URL" +#define HID_FILEDLG_USE_PASSWD "SVT_HID_FILEDLG_USE_PASSWD" +#define HID_FILEDLG_READ_ONLY "SVT_HID_FILEDLG_READ_ONLY" +#define HID_FILEDLG_AUTOCOMPLETEBOX "SVT_HID_FILEDLG_AUTOCOMPLETEBOX" +#define HID_FILEDLG_SAVE_BTN "SVT_HID_FILEDLG_SAVE_BTN" +#define HID_FILEDLG_SAVE_FILENAME "SVT_HID_FILEDLG_SAVE_FILENAME" +#define HID_FILEDLG_SAVE_FILETYPE "SVT_HID_FILEDLG_SAVE_FILETYPE" +#define HID_FILEDLG_INSERT_BTN "SVT_HID_FILEDLG_INSERT_BTN" +#define HID_FILEDLG_PATH_BTN "SVT_HID_FILEDLG_PATH_BTN" +#define HID_FILEDLG_PATH_FILENAME "SVT_HID_FILEDLG_PATH_FILENAME" +#define HID_FILEDLG_FOLDER_BTN "SVT_HID_FILEDLG_FOLDER_BTN" +#define HID_FILEDLG_FOLDER_FILENAME "SVT_HID_FILEDLG_FOLDER_FILENAME" +#define HID_FILEDLG_SRCHFOLDER_BTN "SVT_HID_FILEDLG_SRCHFOLDER_BTN" +#define HID_FILEDLG_EDIT_FAVORITES "SVT_HID_FILEDLG_EDIT_FAVORITES" +#define HID_FILEDLG_NEW_FAVORITE "SVT_HID_FILEDLG_NEW_FAVORITE" +#define HID_FILEDLG_EDIT_FAVORITES_LISTBOX "SVT_HID_FILEDLG_EDIT_FAVORITES_LISTBOX" +#define HID_FILEDLG_EDIT_FAVORITES_HEADERBAR "SVT_HID_FILEDLG_EDIT_FAVORITES_HEADERBAR" +#define HID_FILEDLG_EXPORTASPDF "SVT_HID_FILEDLG_EXPORTASPDF" // HelpID's fuer die Textkomponente -#define HID_TEXTCPNT_OPEN_LINK (HID_SVTOOLS_START + 14) -#define HID_TEXTCPNT_OPEN_LINK_NEW (HID_SVTOOLS_START + 15) -#define HID_TEXTCPNT_DOWNLOAD (HID_SVTOOLS_START + 16) -#define HID_TEXTCPNT_ADD_BOOKMARK (HID_SVTOOLS_START + 17) -#define HID_TEXTCPNT_COPY_LINK (HID_SVTOOLS_START + 18) +#define HID_TEXTCPNT_OPEN_LINK "SVT_HID_TEXTCPNT_OPEN_LINK" +#define HID_TEXTCPNT_OPEN_LINK_NEW "SVT_HID_TEXTCPNT_OPEN_LINK_NEW" +#define HID_TEXTCPNT_DOWNLOAD "SVT_HID_TEXTCPNT_DOWNLOAD" +#define HID_TEXTCPNT_ADD_BOOKMARK "SVT_HID_TEXTCPNT_ADD_BOOKMARK" +#define HID_TEXTCPNT_COPY_LINK "SVT_HID_TEXTCPNT_COPY_LINK" // HelpID's fuer RegisterDialog -#define HID_LIMITED_DIALOG (HID_SVTOOLS_START + 20) +#define HID_LIMITED_DIALOG "SVT_HID_LIMITED_DIALOG" // Help ids of template dialog -#define HID_TEMPLATEDLG_DIALOG (HID_SVTOOLS_START + 21) -#define HID_TEMPLATEDLG_ICONCTRL (HID_SVTOOLS_START + 22) -#define HID_TEMPLATEDLG_FILEVIEW (HID_SVTOOLS_START + 23) -#define HID_TEMPLATEDLG_TB_BACK (HID_SVTOOLS_START + 24) -#define HID_TEMPLATEDLG_TB_PREV (HID_SVTOOLS_START + 25) -#define HID_TEMPLATEDLG_TB_PRINT (HID_SVTOOLS_START + 26) -#define HID_TEMPLATEDLG_TB_DOCINFO (HID_SVTOOLS_START + 27) -#define HID_TEMPLATEDLG_TB_PREVIEW (HID_SVTOOLS_START + 28) +#define HID_TEMPLATEDLG_DIALOG "SVT_HID_TEMPLATEDLG_DIALOG" +#define HID_TEMPLATEDLG_ICONCTRL "SVT_HID_TEMPLATEDLG_ICONCTRL" +#define HID_TEMPLATEDLG_FILEVIEW "SVT_HID_TEMPLATEDLG_FILEVIEW" +#define HID_TEMPLATEDLG_TB_BACK "SVT_HID_TEMPLATEDLG_TB_BACK" +#define HID_TEMPLATEDLG_TB_PREV "SVT_HID_TEMPLATEDLG_TB_PREV" +#define HID_TEMPLATEDLG_TB_PRINT "SVT_HID_TEMPLATEDLG_TB_PRINT" +#define HID_TEMPLATEDLG_TB_DOCINFO "SVT_HID_TEMPLATEDLG_TB_DOCINFO" +#define HID_TEMPLATEDLG_TB_PREVIEW "SVT_HID_TEMPLATEDLG_TB_PREVIEW" -#define HID_ADDRTEMPL_FIELD_ASSIGNMENT (HID_SVTOOLS_START + 29) +#define HID_ADDRTEMPL_FIELD_ASSIGNMENT "SVT_HID_ADDRTEMPL_FIELD_ASSIGNMENT" // Help ids for the filepicker dialogs -#define HID_EXPLORERDLG_FILE (HID_SVTOOLS_START + 30) +#define HID_EXPLORERDLG_FILE "SVT_HID_EXPLORERDLG_FILE" // help ids for fileview contextmenu -#define HID_FILEVIEW_MENU_DELETE (HID_SVTOOLS_START + 31) -#define HID_FILEVIEW_MENU_RENAME (HID_SVTOOLS_START + 32) +#define HID_FILEVIEW_MENU_DELETE "SVT_HID_FILEVIEW_MENU_DELETE" +#define HID_FILEVIEW_MENU_RENAME "SVT_HID_FILEVIEW_MENU_RENAME" // help ids for the different modi of the file picker dialog // FREE -#define HID_FILESAVE_LEVELUP (HID_SVTOOLS_START + 34) -#define HID_FILESAVE_CREATEDIRECTORY (HID_SVTOOLS_START + 35) -#define HID_FILESAVE_DEFAULTDIRECTORY (HID_SVTOOLS_START + 36) -#define HID_FILESAVE_FILEVIEW (HID_SVTOOLS_START + 37) -#define HID_FILESAVE_TEMPLATE (HID_SVTOOLS_START + 38) -#define HID_FILESAVE_FILEURL (HID_SVTOOLS_START + 39) -#define HID_FILESAVE_FILETYPE (HID_SVTOOLS_START + 40) -#define HID_FILESAVE_DOSAVE (HID_SVTOOLS_START + 41) -#define HID_FILESAVE_AUTOEXTENSION (HID_SVTOOLS_START + 42) -#define HID_FILESAVE_SAVEWITHPASSWORD (HID_SVTOOLS_START + 43) -#define HID_FILESAVE_CUSTOMIZEFILTER (HID_SVTOOLS_START + 44) -#define HID_FILESAVE_SELECTION (HID_SVTOOLS_START + 45) -#define HID_FILESAVE_DIALOG (HID_SVTOOLS_START + 46) -#define HID_FILESAVE_DOPLAY (HID_SVTOOLS_START + 47) - -#define HID_FILEOPEN_READONLY (HID_SVTOOLS_START + 48) -#define HID_FILEOPEN_VERSION (HID_SVTOOLS_START + 49) -#define HID_FILEOPEN_IMAGE_TEMPLATE (HID_SVTOOLS_START + 50) - -#define HID_FILEDLG_LINK_CB (HID_SFX_START + 276) -#define HID_FILEDLG_PREVIEW_CB (HID_SFX_START + 277) +#define HID_FILESAVE_LEVELUP "SVT_HID_FILESAVE_LEVELUP" +#define HID_FILESAVE_CREATEDIRECTORY "SVT_HID_FILESAVE_CREATEDIRECTORY" +#define HID_FILESAVE_DEFAULTDIRECTORY "SVT_HID_FILESAVE_DEFAULTDIRECTORY" +#define HID_FILESAVE_FILEVIEW "SVT_HID_FILESAVE_FILEVIEW" +#define HID_FILESAVE_TEMPLATE "SVT_HID_FILESAVE_TEMPLATE" +#define HID_FILESAVE_FILEURL "SVT_HID_FILESAVE_FILEURL" +#define HID_FILESAVE_FILETYPE "SVT_HID_FILESAVE_FILETYPE" +#define HID_FILESAVE_DOSAVE "SVT_HID_FILESAVE_DOSAVE" +#define HID_FILESAVE_AUTOEXTENSION "SVT_HID_FILESAVE_AUTOEXTENSION" +#define HID_FILESAVE_SAVEWITHPASSWORD "SVT_HID_FILESAVE_SAVEWITHPASSWORD" +#define HID_FILESAVE_CUSTOMIZEFILTER "SVT_HID_FILESAVE_CUSTOMIZEFILTER" +#define HID_FILESAVE_SELECTION "SVT_HID_FILESAVE_SELECTION" +#define HID_FILESAVE_DIALOG "SVT_HID_FILESAVE_DIALOG" +#define HID_FILESAVE_DOPLAY "SVT_HID_FILESAVE_DOPLAY" + +#define HID_FILEOPEN_READONLY "SVT_HID_FILEOPEN_READONLY" +#define HID_FILEOPEN_VERSION "SVT_HID_FILEOPEN_VERSION" +#define HID_FILEOPEN_IMAGE_TEMPLATE "SVT_HID_FILEOPEN_IMAGE_TEMPLATE" // uniqueid for the helpagent window (testtool) -#define HID_HELPAGENT_WINDOW (HID_SVTOOLS_START + 51) +#define HID_HELPAGENT_WINDOW "SVT_HID_HELPAGENT_WINDOW" // registration dialog -#define HID_REGISTRATION_DIALOG (HID_SVTOOLS_START + 52) +#define HID_REGISTRATION_DIALOG "SVT_HID_REGISTRATION_DIALOG" -#define HID_PRINTDIALOG_TOFILE (HID_SVTOOLS_START + 53) +#define HID_PRINTDIALOG_TOFILE "SVT_HID_PRINTDIALOG_TOFILE" -#define HID_WIZARD_NEXT (HID_SVTOOLS_START + 54) -#define HID_WIZARD_PREVIOUS (HID_SVTOOLS_START + 55) +#define HID_WIZARD_NEXT "SVT_HID_WIZARD_NEXT" +#define HID_WIZARD_PREVIOUS "SVT_HID_WIZARD_PREVIOUS" #endif diff --git a/svtools/inc/svtools/roadmapwizard.hxx b/svtools/inc/svtools/roadmapwizard.hxx index 5d8e0d9b01bb..25d983c85a90 100644 --- a/svtools/inc/svtools/roadmapwizard.hxx +++ b/svtools/inc/svtools/roadmapwizard.hxx @@ -90,8 +90,8 @@ namespace svt void SetRoadmapBitmap( const BitmapEx& _rBitmap ); const BitmapEx& GetRoadmapBitmap( ) const; - void SetRoadmapSmartHelpId( const SmartId& _rId, SmartIdUpdateMode _aMode = SMART_SET_SMART ); - SmartId GetRoadmapSmartHelpId() const; + void SetRoadmapHelpId( const rtl::OString& _rId ); + const rtl::OString& GetRoadmapHelpId() const; void SetRoadmapInteractive( sal_Bool _bInteractive ); sal_Bool IsRoadmapInteractive(); diff --git a/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtdata.hxx index 1501afbb6157..eb5c5dad1b75 100644 --- a/svtools/inc/svtools/svtdata.hxx +++ b/svtools/inc/svtools/svtdata.hxx @@ -56,7 +56,6 @@ public: }; //============================================================================ - class SvtResId: public ResId { public: diff --git a/svtools/inc/svtools/toolpanel/toolpanel.hxx b/svtools/inc/svtools/toolpanel/toolpanel.hxx index 432dea64e8b5..d38d8e7d257d 100644 --- a/svtools/inc/svtools/toolpanel/toolpanel.hxx +++ b/svtools/inc/svtools/toolpanel/toolpanel.hxx @@ -32,7 +32,6 @@ #include <rtl/ustring.hxx> #include <vcl/image.hxx> -#include <vcl/smartid.hxx> #include <boost/noncopyable.hpp> @@ -62,7 +61,7 @@ namespace svt virtual Image GetImage() const = 0; /// retrieves the help ID associated with the panel, if any. - virtual SmartId GetHelpID() const = 0; + virtual rtl::OString GetHelpID() const = 0; /** activates the panel diff --git a/svtools/inc/tabbar.hxx b/svtools/inc/tabbar.hxx index e036f4c2f045..2757811ba34e 100644 --- a/svtools/inc/tabbar.hxx +++ b/svtools/inc/tabbar.hxx @@ -516,8 +516,8 @@ public: XubString GetPageText( USHORT nPageId ) const; void SetHelpText( USHORT nPageId, const XubString& rText ); XubString GetHelpText( USHORT nPageId ) const; - void SetHelpId( USHORT nPageId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nPageId ) const; + void SetHelpId( USHORT nPageId, const rtl::OString& nHelpId ); + rtl::OString GetHelpId( USHORT nPageId ) const; long GetSplitSize() const { return mnSplitSize; } long GetMinSize() const; @@ -526,9 +526,9 @@ public: { Window::SetHelpText( rText ); } XubString GetHelpText() const { return Window::GetHelpText(); }; - void SetHelpId( ULONG nId ) - { Window::SetHelpId( nId ); } - ULONG GetHelpId() const + void SetHelpId( const rtl::OString& rId ) + { Window::SetHelpId( rId ); } + const rtl::OString& GetHelpId() const { return Window::GetHelpId(); } void SetStyle( WinBits nStyle ); diff --git a/svtools/inc/taskbar.hxx b/svtools/inc/taskbar.hxx index 46853fa07c03..d4a6699e2d5e 100644 --- a/svtools/inc/taskbar.hxx +++ b/svtools/inc/taskbar.hxx @@ -268,7 +268,7 @@ private: Image maImage; XubString maQuickHelpText; XubString maHelpText; - ULONG mnHelpId; + rtl::OString maHelpId; USHORT mnFlags; public: @@ -289,8 +289,8 @@ public: const XubString& GetQuickHelpText() const { return maQuickHelpText; } void SetHelpText( const XubString& rStr ) { maHelpText = rStr; } const XubString& GetHelpText() const { return maHelpText; } - void SetHelpId( ULONG nHelpId ) { mnHelpId = nHelpId; } - ULONG GetHelpId() const { return mnHelpId; } + void SetHelpId( const rtl::OString& rHelpId ) { maHelpId = rHelpId; } + const rtl::OString& GetHelpId() const { return maHelpId; } void SetFlags( USHORT nFlags ) { mnFlags = nFlags; } USHORT GetFlags() const { return mnFlags; } diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index af19379d8b8f..7c1dd8362e86 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -1443,16 +1443,16 @@ sal_Bool SvtFileView::GetParentURL( String& rParentURL ) const // ----------------------------------------------------------------------- -sal_uInt32 SvtFileView::GetHelpId( ) const +const rtl::OString& SvtFileView::GetHelpId( ) const { return mpImp->mpView->GetHelpId( ); } // ----------------------------------------------------------------------- -void SvtFileView::SetHelpId( sal_uInt32 nHelpId ) +void SvtFileView::SetHelpId( const rtl::OString& rHelpId ) { - mpImp->mpView->SetHelpId( nHelpId ); + mpImp->mpView->SetHelpId( rHelpId ); } // ----------------------------------------------------------------------- diff --git a/svtools/source/contnr/fileview.src b/svtools/source/contnr/fileview.src index f40530c10347..bcb282f44615 100644 --- a/svtools/source/contnr/fileview.src +++ b/svtools/source/contnr/fileview.src @@ -110,6 +110,7 @@ Menu RID_FILEVIEW_CONTEXTMENU ModalDialog DLG_SVT_QUERYDELETE { + HelpID = "svtools:ModalDialog:DLG_SVT_QUERYDELETE"; SVLook = TRUE ; OutputSize = TRUE ; Moveable = TRUE ; @@ -142,6 +143,7 @@ ModalDialog DLG_SVT_QUERYDELETE PushButton BTN_YES { + HelpID = "svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_YES"; Pos = MAP_APPFONT ( 6 , 47 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -151,6 +153,7 @@ ModalDialog DLG_SVT_QUERYDELETE PushButton BTN_ALL { + HelpID = "svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_ALL"; Pos = MAP_APPFONT ( 59 , 47 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -160,6 +163,7 @@ ModalDialog DLG_SVT_QUERYDELETE PushButton BTN_NO { + HelpID = "svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_NO"; Pos = MAP_APPFONT ( 112 , 47 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; diff --git a/svtools/source/contnr/templwin.src b/svtools/source/contnr/templwin.src index 048d052c18d8..45f9803539a1 100644 --- a/svtools/source/contnr/templwin.src +++ b/svtools/source/contnr/templwin.src @@ -289,12 +289,14 @@ ModalDialog DLG_DOCTEMPLATE }; PushButton BTN_DOCTEMPLATE_MANAGE { + HelpID = "svtools:PushButton:DLG_DOCTEMPLATE:BTN_DOCTEMPLATE_MANAGE"; Pos = MAP_APPFONT( 6, 230 ); Size = MAP_APPFONT( 50, 14 ); Text [ en-US ] = "Organi~ze..."; }; PushButton BTN_DOCTEMPLATE_EDIT { + HelpID = "svtools:PushButton:DLG_DOCTEMPLATE:BTN_DOCTEMPLATE_EDIT"; Pos = MAP_APPFONT( 59, 230 ); Size = MAP_APPFONT( 50, 14 ); Text [ en-US ] = "~Edit"; diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 1ae223bebf06..7b1f2ad87108 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -53,7 +53,7 @@ struct ImplHeadItem USHORT mnId; HeaderBarItemBits mnBits; long mnSize; - ULONG mnHelpId; + rtl::OString maHelpId; Image maImage; XubString maOutText; XubString maText; @@ -1132,13 +1132,13 @@ void HeaderBar::RequestHelp( const HelpEvent& rHEvt ) } else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { - ULONG nHelpId = GetHelpId( nItemId ); - if ( nHelpId ) + rtl::OUString aHelpId( rtl::OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) ); + if ( aHelpId.getLength() ) { // Wenn eine Hilfe existiert, dann ausloesen Help* pHelp = Application::GetHelp(); if ( pHelp ) - pHelp->Start( nHelpId, this ); + pHelp->Start( aHelpId, this ); return; } } @@ -1266,7 +1266,6 @@ void HeaderBar::InsertItem( USHORT nItemId, const XubString& rText, pItem->mnId = nItemId; pItem->mnBits = nBits; pItem->mnSize = nSize; - pItem->mnHelpId = 0; pItem->maText = rText; pItem->mpUserData = 0; mpItemList->Insert( pItem, nPos ); @@ -1291,7 +1290,6 @@ void HeaderBar::InsertItem( USHORT nItemId, pItem->mnId = nItemId; pItem->mnBits = nBits; pItem->mnSize = nSize; - pItem->mnHelpId = 0; pItem->maImage = rImage; pItem->maText = rText; pItem->mpUserData = 0; @@ -1563,11 +1561,11 @@ XubString HeaderBar::GetHelpText( USHORT nItemId ) const if ( nPos != HEADERBAR_ITEM_NOTFOUND ) { ImplHeadItem* pItem = mpItemList->GetObject( nPos ); - if ( !pItem->maHelpText.Len() && pItem->mnHelpId ) + if ( !pItem->maHelpText.Len() && pItem->maHelpId.getLength() ) { Help* pHelp = Application::GetHelp(); if ( pHelp ) - pItem->maHelpText = pHelp->GetHelpText( pItem->mnHelpId, this ); + pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); } return pItem->maHelpText; @@ -1578,22 +1576,22 @@ XubString HeaderBar::GetHelpText( USHORT nItemId ) const // ----------------------------------------------------------------------- -void HeaderBar::SetHelpId( USHORT nItemId, ULONG nHelpId ) +void HeaderBar::SetHelpId( USHORT nItemId, const rtl::OString& rHelpId ) { USHORT nPos = GetItemPos( nItemId ); if ( nPos != HEADERBAR_ITEM_NOTFOUND ) - mpItemList->GetObject( nPos )->mnHelpId = nHelpId; + mpItemList->GetObject( nPos )->maHelpId = rHelpId; } // ----------------------------------------------------------------------- -ULONG HeaderBar::GetHelpId( USHORT nItemId ) const +rtl::OString HeaderBar::GetHelpId( USHORT nItemId ) const { USHORT nPos = GetItemPos( nItemId ); + rtl::OString aRet; if ( nPos != HEADERBAR_ITEM_NOTFOUND ) - return mpItemList->GetObject( nPos )->mnHelpId; - else - return 0; + aRet = mpItemList->GetObject( nPos )->maHelpId; + return aRet; } // ----------------------------------------------------------------------- diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 02a578629039..6781efc070fe 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -858,7 +858,7 @@ SvtURLBox::SvtURLBox( Window* pParent, const ResId& _rResId, INetProtocol eSmart void SvtURLBox::ImplInit() { pImp = new SvtURLBox_Impl(); - SetHelpId( SID_OPENURL ); + SetHelpId( ".uno:OpenURL" ); EnableAutocomplete( FALSE ); SetText( String() ); diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 2ad81da40716..315e432edd60 100755 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -60,7 +60,7 @@ struct ImplTabBarItem XubString maHelpText; Rectangle maRect; long mnWidth; - ULONG mnHelpId; + rtl::OString maHelpId; BOOL mbShort; BOOL mbSelect; BOOL mbEnable; @@ -76,7 +76,6 @@ struct ImplTabBarItem mnId = nItemId; mnBits = nPageBits; mnWidth = 0; - mnHelpId = 0; mbShort = FALSE; mbSelect = FALSE; mbEnable = TRUE; @@ -1394,13 +1393,13 @@ void TabBar::RequestHelp( const HelpEvent& rHEvt ) } else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { - ULONG nHelpId = GetHelpId( nItemId ); - if ( nHelpId ) + rtl::OUString aHelpId( rtl::OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) ); + if ( aHelpId.getLength() ) { // Wenn eine Hilfe existiert, dann ausloesen Help* pHelp = Application::GetHelp(); if ( pHelp ) - pHelp->Start( nHelpId, this ); + pHelp->Start( aHelpId, this ); return; } } @@ -2400,11 +2399,11 @@ XubString TabBar::GetHelpText( USHORT nPageId ) const if ( nPos != PAGE_NOT_FOUND ) { ImplTabBarItem* pItem = mpItemList->GetObject( nPos ); - if ( !pItem->maHelpText.Len() && pItem->mnHelpId ) + if ( !pItem->maHelpText.Len() && pItem->maHelpId.getLength() ) { Help* pHelp = Application::GetHelp(); if ( pHelp ) - pItem->maHelpText = pHelp->GetHelpText( pItem->mnHelpId, this ); + pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); } return pItem->maHelpText; @@ -2415,22 +2414,22 @@ XubString TabBar::GetHelpText( USHORT nPageId ) const // ----------------------------------------------------------------------- -void TabBar::SetHelpId( USHORT nPageId, ULONG nHelpId ) +void TabBar::SetHelpId( USHORT nPageId, const rtl::OString& rHelpId ) { USHORT nPos = GetPagePos( nPageId ); if ( nPos != PAGE_NOT_FOUND ) - mpItemList->GetObject( nPos )->mnHelpId = nHelpId; + mpItemList->GetObject( nPos )->maHelpId = rHelpId; } // ----------------------------------------------------------------------- -ULONG TabBar::GetHelpId( USHORT nPageId ) const +rtl::OString TabBar::GetHelpId( USHORT nPageId ) const { USHORT nPos = GetPagePos( nPageId ); + rtl::OString aRet; if ( nPos != PAGE_NOT_FOUND ) - return mpItemList->GetObject( nPos )->mnHelpId; - else - return 0; + aRet = mpItemList->GetObject( nPos )->maHelpId; + return aRet; } // ----------------------------------------------------------------------- diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx index 2fdab63be37f..ba5e8d53b8b2 100644 --- a/svtools/source/control/taskstat.cxx +++ b/svtools/source/control/taskstat.cxx @@ -517,13 +517,13 @@ void TaskStatusBar::RequestHelp( const HelpEvent& rHEvt ) { if ( pItem ) { - ULONG nHelpId = pItem->maItem.GetHelpId(); - if ( nHelpId ) + rtl::OUString aHelpId( rtl::OStringToOUString( pItem->maItem.GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); + if ( aHelpId.getLength() ) { // Wenn eine Hilfe existiert, dann ausloesen Help* pHelp = Application::GetHelp(); if ( pHelp ) - pHelp->Start( nHelpId, this ); + pHelp->Start( aHelpId, this ); return; } } diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src index 0652dfb9d0f5..990dfc98f89b 100644 --- a/svtools/source/dialogs/addresstemplate.src +++ b/svtools/source/dialogs/addresstemplate.src @@ -39,6 +39,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE { + HelpID = "svtools:ModalDialog:DLG_ADDRESSBOOKSOURCE"; SVLook = TRUE ; OutputSize = TRUE ; Size = MAP_APPFONT ( 300 , 88 + FIELD_ROW_HEIGHT * FIELD_PAIRS_VISIBLE ) ; @@ -64,6 +65,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE }; ComboBox CB_DATASOURCE { + HelpID = "svtools:ComboBox:DLG_ADDRESSBOOKSOURCE:CB_DATASOURCE"; SVLook = TRUE ; Pos = MAP_APPFONT ( 105, 13 ) ; Size = MAP_APPFONT ( 96, 55 ) ; @@ -73,6 +75,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE }; PushButton PB_ADMINISTATE_DATASOURCES { + HelpID = "svtools:PushButton:DLG_ADDRESSBOOKSOURCE:PB_ADMINISTATE_DATASOURCES"; Text [ en-US ] = "~Address Data Source..."; SVLook = TRUE ; Pos = MAP_APPFONT ( 204, 13 ) ; @@ -90,6 +93,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE }; ComboBox CB_TABLE { + HelpID = "svtools:ComboBox:DLG_ADDRESSBOOKSOURCE:CB_TABLE"; SVLook = TRUE ; Pos = MAP_APPFONT ( 105, 30 ) ; Size = MAP_APPFONT ( 96, 55 ) ; diff --git a/svtools/source/dialogs/colrdlg.src b/svtools/source/dialogs/colrdlg.src index ad9a5c1aa015..a93642b0bd05 100644 --- a/svtools/source/dialogs/colrdlg.src +++ b/svtools/source/dialogs/colrdlg.src @@ -29,6 +29,7 @@ #define DIFF 3 ModalDialog DLG_COLOR { + HelpID = "svtools:ModalDialog:DLG_COLOR"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 165 + DIFF ) ; @@ -93,6 +94,7 @@ ModalDialog DLG_COLOR }; MetricField NUM_CYAN { + HelpID = "svtools:MetricField:DLG_COLOR:NUM_CYAN"; Border = TRUE ; Pos = MAP_APPFONT ( 42 , 109 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -106,6 +108,7 @@ ModalDialog DLG_COLOR }; MetricField NUM_MAGENTA { + HelpID = "svtools:MetricField:DLG_COLOR:NUM_MAGENTA"; Border = TRUE ; Pos = MAP_APPFONT ( 42 , 122 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -119,6 +122,7 @@ ModalDialog DLG_COLOR }; MetricField NUM_YELLOW { + HelpID = "svtools:MetricField:DLG_COLOR:NUM_YELLOW"; Border = TRUE ; Pos = MAP_APPFONT ( 42 , 135 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -132,6 +136,7 @@ ModalDialog DLG_COLOR }; MetricField NUM_KEY { + HelpID = "svtools:MetricField:DLG_COLOR:NUM_KEY"; Border = TRUE ; Pos = MAP_APPFONT ( 42 , 148 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -163,6 +168,7 @@ ModalDialog DLG_COLOR }; NumericField NUM_RED { + HelpID = "svtools:NumericField:DLG_COLOR:NUM_RED"; Border = TRUE ; Pos = MAP_APPFONT ( 106 , 122 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -174,6 +180,7 @@ ModalDialog DLG_COLOR }; NumericField NUM_GREEN { + HelpID = "svtools:NumericField:DLG_COLOR:NUM_GREEN"; Border = TRUE ; Pos = MAP_APPFONT ( 106 , 135 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -185,6 +192,7 @@ ModalDialog DLG_COLOR }; NumericField NUM_BLUE { + HelpID = "svtools:NumericField:DLG_COLOR:NUM_BLUE"; Border = TRUE ; Pos = MAP_APPFONT ( 106 , 148 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -202,6 +210,7 @@ ModalDialog DLG_COLOR }; NumericField NUM_HUE { + HelpID = "svtools:NumericField:DLG_COLOR:NUM_HUE"; Border = TRUE ; Pos = MAP_APPFONT ( 171 , 122 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -219,6 +228,7 @@ ModalDialog DLG_COLOR }; NumericField NUM_SATURATION { + HelpID = "svtools:NumericField:DLG_COLOR:NUM_SATURATION"; Border = TRUE ; Pos = MAP_APPFONT ( 171 , 135 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -236,6 +246,7 @@ ModalDialog DLG_COLOR }; NumericField NUM_LUMINANCE { + HelpID = "svtools:NumericField:DLG_COLOR:NUM_LUMINANCE"; Border = TRUE ; Pos = MAP_APPFONT ( 171 , 148 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -247,6 +258,7 @@ ModalDialog DLG_COLOR }; PushButton BTN_1 { + HelpID = "svtools:PushButton:DLG_COLOR:BTN_1"; Pos = MAP_APPFONT ( 80 , 109 ) ; Size = MAP_APPFONT ( 17 , 12 ) ; Text = "~<--" ; @@ -254,6 +266,7 @@ ModalDialog DLG_COLOR }; PushButton BTN_2 { + HelpID = "svtools:PushButton:DLG_COLOR:BTN_2"; Pos = MAP_APPFONT ( 100 , 109 ) ; Size = MAP_APPFONT ( 17 , 12 ) ; Text = "--~>" ; diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx index 798ff87e02ac..67262ba72c1a 100644 --- a/svtools/source/dialogs/filedlg2.cxx +++ b/svtools/source/dialogs/filedlg2.cxx @@ -68,9 +68,9 @@ DECLARE_LIST( UniStringList, UniString* ) // #define STD_BTN_WIDTH 90 // #define STD_BTN_HEIGHT 35 -#define INITCONTROL( p, ControlClass, nBits, aPos, aSize, aTitel, nHelpId ) \ +#define INITCONTROL( p, ControlClass, nBits, aPos, aSize, aTitel, rHelpId ) \ p = new ControlClass( GetPathDialog(), WinBits( nBits ) ); \ - p->SetHelpId( nHelpId ); \ + p->SetHelpId( rHelpId ); \ p->SetPosSizePixel( aPos, aSize ); \ p->SetText( aTitel ); \ p->Show(); @@ -226,10 +226,10 @@ void ImpPathDialog::InitControls() aPnt.X() = 2 * a6Siz.Width() + aEDSiz.Width(); aPnt.Y() = a6Siz.Height(); INITCONTROL( pOkBtn, PushButton, WB_DEFBUTTON, - aPnt, aBtnSiz, aOkStr, 0 ); + aPnt, aBtnSiz, aOkStr, "" ); aPnt.Y() += aBtnSiz.Height() + a3Siz.Height(); INITCONTROL( pCancelBtn, CancelButton, 0, - aPnt, aBtnSiz, aCancelStr, 0 ); + aPnt, aBtnSiz, aCancelStr, "" ); aPnt.Y() += aBtnSiz.Height() + a3Siz.Height(); INITCONTROL( pNewDirBtn, PushButton, WB_DEFBUTTON, aPnt, aBtnSiz, aNewDirStr, HID_FILEDLG_NEWDIR ); @@ -782,10 +782,10 @@ void ImpFileDialog::InitControls() const long nButtonStartX = 2*nW+20+15; INITCONTROL( pOkBtn, PushButton, WB_DEFBUTTON, Point(nButtonStartX, 10), Size(STD_BTN_WIDTH, STD_BTN_HEIGHT), - Button::GetStandardText( BUTTON_OK ), 0 ); + Button::GetStandardText( BUTTON_OK ), "" ); INITCONTROL( pCancelBtn, CancelButton, 0, Point(nButtonStartX, 45 ), Size(STD_BTN_WIDTH, STD_BTN_HEIGHT), - Button::GetStandardText( BUTTON_CANCEL ), 0 ); + Button::GetStandardText( BUTTON_CANCEL ), "" ); pLoadBtn = 0; diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx index 532fd3f61bb2..dba5ed627952 100644 --- a/svtools/source/dialogs/printdlg.cxx +++ b/svtools/source/dialogs/printdlg.cxx @@ -28,26 +28,18 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" #include <tools/debug.hxx> -#ifndef _SV_APP_HXX #include <vcl/svapp.hxx> -#endif -#ifndef _VCL_PRINT_HXX #include <vcl/print.hxx> -#endif #include <vcl/msgbox.hxx> #include <vcl/jobset.hxx> #include <tools/urlobj.hxx> - #include "printdlg.hrc" #include "controldims.hrc" #include <svtools/prnsetup.hxx> #include <svtools/printdlg.hxx> #include <svtools/svtdata.hxx> #include <filedlg.hxx> -#include "svl/pickerhelper.hxx" -#ifndef _SVT_HELPID_HRC #include <svtools/helpid.hrc> -#endif #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/ui/dialogs/XFilePicker.hpp> diff --git a/svtools/source/dialogs/printdlg.src b/svtools/source/dialogs/printdlg.src index 405accc63344..80c6e465d49a 100644 --- a/svtools/source/dialogs/printdlg.src +++ b/svtools/source/dialogs/printdlg.src @@ -31,6 +31,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG { + HelpID = "svtools:ModalDialog:DLG_SVT_PRNDLG_PRINTDLG"; SVLook = TRUE ; OutputSize = TRUE ; Moveable = TRUE ; @@ -50,6 +51,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; ListBox LB_NAMES { + HelpID = "svtools:ListBox:DLG_SVT_PRNDLG_PRINTDLG:LB_NAMES"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 13 ) ; Size = MAP_APPFONT ( 130 , 80 ) ; @@ -58,6 +60,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; PushButton BTN_PROPERTIES { + HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_PROPERTIES"; Pos = MAP_APPFONT ( 193 , 12 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "Propert~ies..." ; @@ -114,12 +117,14 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; Edit EDT_FAXNO { + HelpID = "svtools:Edit:DLG_SVT_PRNDLG_PRINTDLG:EDT_FAXNO"; Border = TRUE; Pos = MAP_APPFONT ( 60 , 73 ); Size = MAP_APPFONT ( 188 , 12 ); }; CheckBox CBX_FILEPRINT { + HelpID = "svtools:CheckBox:DLG_SVT_PRNDLG_PRINTDLG:CBX_FILEPRINT"; Pos = MAP_APPFONT ( 12 , 73 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; Text [ en-US ] = "Print to file" ; @@ -132,6 +137,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG /*!!! PushButton BTN_BROWSE { + HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_BROWSE"; Pos = MAP_APPFONT ( 234 , 75 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "~..." ; @@ -146,18 +152,21 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; RadioButton RBT_ALL_SHEETS { + HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_ALL_SHEETS"; Pos = MAP_APPFONT ( 12 , 102 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "All sheets" ; }; RadioButton RBT_SELECTED_SHEETS { + HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTED_SHEETS"; Pos = MAP_APPFONT ( 12 , 115 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Selected sheets" ; }; RadioButton RBT_SELECTED_CELLS { + HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTED_CELLS"; Pos = MAP_APPFONT ( 12 , 128 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Selected cells" ; @@ -170,24 +179,28 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; RadioButton RBT_ALL { + HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_ALL"; Pos = MAP_APPFONT ( 12 , 152 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "All pages" ; }; RadioButton RBT_PAGES { + HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_PAGES"; Pos = MAP_APPFONT ( 12 , 165 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Text [ en-US ] = "Pages" ; }; Edit EDT_PAGES { + HelpID = "svtools:Edit:DLG_SVT_PRNDLG_PRINTDLG:EDT_PAGES"; Border = TRUE ; Pos = MAP_APPFONT ( 65 , 164 ) ; Size = MAP_APPFONT ( 52 , 12 ) ; }; RadioButton RBT_SELECTION { + HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTION"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 179 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; @@ -213,6 +226,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; NumericField NUM_COPIES { + HelpID = "svtools:NumericField:DLG_SVT_PRNDLG_PRINTDLG:NUM_COPIES"; Border = TRUE ; Pos = MAP_APPFONT ( 201 , 102 ) ; Size = MAP_APPFONT ( 33 , 12 ) ; @@ -226,6 +240,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; CheckBox CBX_COLLATE { + HelpID = "svtools:CheckBox:DLG_SVT_PRNDLG_PRINTDLG:CBX_COLLATE"; Pos = MAP_APPFONT ( 201 , 123 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "Co~llate" ; @@ -249,6 +264,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; PushButton BTN_OPTIONS { + HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_OPTIONS"; Hide = TRUE ; Pos = MAP_APPFONT ( 6 , 190 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; diff --git a/svtools/source/dialogs/prnsetup.src b/svtools/source/dialogs/prnsetup.src index 1443a35e0f39..afdf7d56864e 100644 --- a/svtools/source/dialogs/prnsetup.src +++ b/svtools/source/dialogs/prnsetup.src @@ -138,6 +138,7 @@ String STR_SVT_PRNDLG_JOBCOUNT ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG { + HelpID = "svtools:ModalDialog:DLG_SVT_PRNDLG_PRNSETUPDLG"; OutputSize = TRUE ; SVLook = TRUE ; Moveable = TRUE ; @@ -157,6 +158,7 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG }; ListBox LB_NAMES { + HelpID = "svtools:ListBox:DLG_SVT_PRNDLG_PRNSETUPDLG:LB_NAMES"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 12 ) ; Size = MAP_APPFONT ( 125 , 80 ) ; @@ -165,6 +167,7 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG }; PushButton BTN_PROPERTIES { + HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRNSETUPDLG:BTN_PROPERTIES"; Pos = MAP_APPFONT ( 188 , 12 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "Propert~ies..." ; @@ -220,6 +223,7 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG }; PushButton BTN_OPTIONS { + HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRNSETUPDLG:BTN_OPTIONS"; Pos = MAP_APPFONT ( 5 , 84 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Options..." ; diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index c28cfe1d4b18..43b9fcddf91d 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -239,15 +239,15 @@ namespace svt } //-------------------------------------------------------------------- - void RoadmapWizard::SetRoadmapSmartHelpId( const SmartId& _rId, SmartIdUpdateMode _aMode ) + void RoadmapWizard::SetRoadmapHelpId( const rtl::OString& _rId ) { - m_pImpl->pRoadmap->SetSmartHelpId( _rId, _aMode ); + m_pImpl->pRoadmap->SetHelpId( _rId ); } //-------------------------------------------------------------------- - SmartId RoadmapWizard::GetRoadmapSmartHelpId() const + const rtl::OString& RoadmapWizard::GetRoadmapHelpId() const { - return m_pImpl->pRoadmap->GetSmartHelpId(); + return m_pImpl->pRoadmap->GetHelpId(); } //-------------------------------------------------------------------- diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index 2053da80019d..41e759eda43b 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -197,7 +197,7 @@ namespace svt if (_nButtonFlags & WZB_PREVIOUS) { m_pPrevPage = new PushButton(this, WB_TABSTOP); - m_pPrevPage->SetSmartHelpId( SmartId(HID_WIZARD_PREVIOUS) ); + m_pPrevPage->SetHelpId( HID_WIZARD_PREVIOUS ); m_pPrevPage->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) ); m_pPrevPage->SetText(String(SvtResId(STR_WIZDLG_PREVIOUS))); m_pPrevPage->Show(); @@ -214,7 +214,7 @@ namespace svt if (_nButtonFlags & WZB_NEXT) { m_pNextPage = new PushButton(this, WB_TABSTOP); - m_pNextPage->SetSmartHelpId( SmartId(HID_WIZARD_NEXT) ); + m_pNextPage->SetHelpId( HID_WIZARD_NEXT ); m_pNextPage->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) ); m_pNextPage->SetText(String(SvtResId(STR_WIZDLG_NEXT))); m_pNextPage->Show(); diff --git a/svtools/source/filter.vcl/filter/exportdialog.src b/svtools/source/filter.vcl/filter/exportdialog.src index 065fcee6ba18..c9e87989a314 100755..100644 --- a/svtools/source/filter.vcl/filter/exportdialog.src +++ b/svtools/source/filter.vcl/filter/exportdialog.src @@ -34,6 +34,7 @@ String DLG_EXPORT_TITLE ModalDialog DLG_EXPORT { + HelpID = "svtools:ModalDialog:DLG_EXPORT"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 178 , 135 ) ; @@ -54,6 +55,7 @@ ModalDialog DLG_EXPORT }; MetricField MF_SIZEX { + HelpID = "svtools:MetricField:DLG_EXPORT:MF_SIZEX"; Hide = TRUE; Border = TRUE; Size = MAP_APPFONT ( 30, 12 ) ; @@ -68,6 +70,7 @@ ModalDialog DLG_EXPORT }; ListBox LB_SIZEX { + HelpID = "svtools:ListBox:DLG_EXPORT:LB_SIZEX"; Hide = TRUE; Border = TRUE ; Size = MAP_APPFONT ( 60, 80 ) ; @@ -90,6 +93,7 @@ ModalDialog DLG_EXPORT }; MetricField MF_SIZEY { + HelpID = "svtools:MetricField:DLG_EXPORT:MF_SIZEY"; Hide = TRUE; Border = TRUE; Size = MAP_APPFONT ( 30, 12 ); @@ -104,6 +108,7 @@ ModalDialog DLG_EXPORT }; ListBox LB_SIZEY { + HelpID = "svtools:ListBox:DLG_EXPORT:LB_SIZEY"; Hide = TRUE; Border = TRUE ; Size = MAP_APPFONT ( 60, 80 ) ; @@ -126,6 +131,7 @@ ModalDialog DLG_EXPORT }; NumericField NF_RESOLUTION { + HelpID = "svtools:NumericField:DLG_EXPORT:NF_RESOLUTION"; Hide = TRUE; Border = TRUE ; Size = MAP_APPFONT ( 30, 12 ) ; @@ -137,6 +143,7 @@ ModalDialog DLG_EXPORT }; ListBox LB_RESOLUTION { + HelpID = "svtools:ListBox:DLG_EXPORT:LB_RESOLUTION"; Hide = TRUE; Border = TRUE ; Size = MAP_APPFONT ( 60, 80 ) ; @@ -157,6 +164,7 @@ ModalDialog DLG_EXPORT }; ListBox LB_COLOR_DEPTH { + HelpID = "svtools:ListBox:DLG_EXPORT:LB_COLOR_DEPTH"; Hide = TRUE; Border = TRUE ; Size = MAP_APPFONT ( 60, 80 ) ; @@ -225,6 +233,7 @@ ModalDialog DLG_EXPORT }; NumericField NF_COMPRESSION { + HelpID = "svtools:NumericField:DLG_EXPORT:NF_COMPRESSION"; Hide = TRUE; Border = TRUE ; Size = MAP_APPFONT ( 30, 12 ) ; @@ -260,18 +269,21 @@ ModalDialog DLG_EXPORT }; CheckBox CB_JPG_PREVIEW { + HelpID = "svtools:CheckBox:DLG_EXPORT:CB_JPG_PREVIEW"; Hide = TRUE; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "Preview" ; }; CheckBox CB_INTERLACED { + HelpID = "svtools:CheckBox:DLG_EXPORT:CB_INTERLACED"; Hide = TRUE; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "Interlaced" ; }; CheckBox CB_RLE_ENCODING { + HelpID = "svtools:CheckBox:DLG_EXPORT:CB_RLE_ENCODING"; Hide = TRUE; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "RLE encoding" ; @@ -284,18 +296,21 @@ ModalDialog DLG_EXPORT }; CheckBox CB_SAVE_TRANSPARENCY { + HelpID = "svtools:CheckBox:DLG_EXPORT:CB_SAVE_TRANSPARENCY"; Hide = TRUE; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "Save transparency" ; }; RadioButton RB_BINARY { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_BINARY"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Binary" ; }; RadioButton RB_TEXT { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_TEXT"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Text" ; @@ -308,12 +323,14 @@ ModalDialog DLG_EXPORT }; CheckBox CB_EPS_PREVIEW_TIFF { + HelpID = "svtools:CheckBox:DLG_EXPORT:CB_EPS_PREVIEW_TIFF"; Hide = TRUE; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "Image Preview (TIFF)" ; }; CheckBox CB_EPS_PREVIEW_EPSI { + HelpID = "svtools:CheckBox:DLG_EXPORT:CB_EPS_PREVIEW_EPSI"; Hide = TRUE; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "Interchange (EPSI)" ; @@ -326,12 +343,14 @@ ModalDialog DLG_EXPORT }; RadioButton RB_EPS_LEVEL1 { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_LEVEL1"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Level 1" ; }; RadioButton RB_EPS_LEVEL2 { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_LEVEL2"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Level 2" ; @@ -344,24 +363,28 @@ ModalDialog DLG_EXPORT }; RadioButton RB_EPS_COLOR_FORMAT1 { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COLOR_FORMAT1"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Color" ; }; RadioButton RB_EPS_COLOR_FORMAT2 { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COLOR_FORMAT2"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Grayscale" ; }; RadioButton RB_EPS_COMPRESSION_LZW { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COMPRESSION_LZW"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "LZW encoding" ; }; RadioButton RB_EPS_COMPRESSION_NONE { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COMPRESSION_NONE"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "None" ; @@ -413,6 +436,7 @@ ModalDialog DLG_EXPORT }; NumericField NF_ZOOM { + HelpID = "svtools:NumericField:DLG_EXPORT:NF_ZOOM"; Hide = TRUE; Border = TRUE ; Size = MAP_APPFONT ( 30, 12 ) ; diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx index dc01de750b06..a7420dbc388f 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -149,10 +149,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque m_bJavaNotFound_Handled = true; WarningBox aWarningBox( NULL, SvtResId( WARNINGBOX_JAVANOTFOUND ) ); String aTitle( SvtResId( STR_WARNING_JAVANOTFOUND ) ); - aWarningBox.SetText( aTitle ); nResult = aWarningBox.Execute(); - } else { @@ -168,7 +166,6 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque m_bInvalidSettings_Handled = true; WarningBox aWarningBox( NULL, SvtResId( WARNINGBOX_INVALIDJAVASETTINGS ) ); String aTitle( SvtResId(STR_WARNING_INVALIDJAVASETTINGS)); - aWarningBox.SetText( aTitle ); nResult = aWarningBox.Execute(); } @@ -186,7 +183,6 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque // Java disabled. Give user a chance to enable Java inside Office. QueryBox aQueryBox( NULL, SvtResId( QBX_JAVADISABLED ) ); String aTitle( SvtResId( STR_QUESTION_JAVADISABLED ) ); - aQueryBox.SetText( aTitle ); nResult = aQueryBox.Execute(); if ( nResult == RET_YES ) @@ -211,7 +207,6 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque m_bVMCreationFailure_Handled = true; ErrorBox aErrorBox( NULL, SvtResId( ERRORBOX_JVMCREATIONFAILED ) ); String aTitle( SvtResId( STR_ERROR_JVMCREATIONFAILED ) ); - aErrorBox.SetText( aTitle ); nResult = aErrorBox.Execute(); } @@ -230,7 +225,6 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque m_bRestartRequired_Handled = true; ErrorBox aErrorBox(NULL, SvtResId( ERRORBOX_RESTARTREQUIRED ) ); String aTitle( SvtResId( STR_ERROR_RESTARTREQUIRED ) ); - aErrorBox.SetText( aTitle ); nResult = aErrorBox.Execute(); } diff --git a/svtools/source/plugapp/testtool.src b/svtools/source/plugapp/testtool.src index 9cc52c58f013..e456200943f6 100644 --- a/svtools/source/plugapp/testtool.src +++ b/svtools/source/plugapp/testtool.src @@ -104,6 +104,7 @@ Bitmap TT_SHOW2 { }; WorkWindow TT_INLINE_TRANSLATION { + HelpID = "svtools:WorkWindow:TT_INLINE_TRANSLATION"; SVLook = TRUE; Size = MAP_APPFONT( 2*Control_Border + 4*ButtonWidth + 3*Button_Button, 120 ); Moveable = TRUE; @@ -116,6 +117,7 @@ WorkWindow TT_INLINE_TRANSLATION { Text[ en-US ] = "Translation"; }; Edit TT_E_NEW { + HelpID = "svtools:Edit:TT_INLINE_TRANSLATION:TT_E_NEW"; Disable = TRUE; Border = TRUE; Pos = MAP_APPFONT( 7, 16 ); @@ -134,6 +136,7 @@ WorkWindow TT_INLINE_TRANSLATION { Text[ en-US ] = "Comment"; }; Edit TT_E_COMMENT { + HelpID = "svtools:Edit:TT_INLINE_TRANSLATION:TT_E_COMMENT"; Disable = TRUE; Border = TRUE; Pos = MAP_APPFONT( 7, 64 ); @@ -142,12 +145,14 @@ WorkWindow TT_INLINE_TRANSLATION { Text[ en-US ] = "~Comment"; }; PushButton TT_PB_SELECT { + HelpID = "svtools:PushButton:TT_INLINE_TRANSLATION:TT_PB_SELECT"; Pos = MAP_APPFONT( Control_Border, 89 ); Size = MAP_APPFONT( ButtonWidth, 12 ); TabStop = TRUE; Text[ en-US ] = "~Select"; }; PushButton TT_PB_RESTORE { + HelpID = "svtools:PushButton:TT_INLINE_TRANSLATION:TT_PB_RESTORE"; Disable = TRUE; Pos = MAP_APPFONT( Control_Border + ButtonWidth + Button_Button, 89 ); Size = MAP_APPFONT( ButtonWidth, 12 ); @@ -155,6 +160,7 @@ WorkWindow TT_INLINE_TRANSLATION { Text[ en-US ] = "~Restore"; }; PushButton TT_PB_ACCEPT { + HelpID = "svtools:PushButton:TT_INLINE_TRANSLATION:TT_PB_ACCEPT"; Disable = TRUE; Pos = MAP_APPFONT( Control_Border + 2*(ButtonWidth + Button_Button), 89 ); Size = MAP_APPFONT( ButtonWidth, 12 ); @@ -162,6 +168,7 @@ WorkWindow TT_INLINE_TRANSLATION { Text[ en-US ] = "~Accept"; }; PushButton TT_PB_NEXT { + HelpID = "svtools:PushButton:TT_INLINE_TRANSLATION:TT_PB_NEXT"; Pos = MAP_APPFONT( Control_Border + 3*(ButtonWidth + Button_Button), 89 ); Size = MAP_APPFONT( ButtonWidth, 12 ); TabStop = TRUE; diff --git a/svtools/source/productregistration/registrationdlg.src b/svtools/source/productregistration/registrationdlg.src index c4cdcbcbe3ec..64f1063f1ba3 100644 --- a/svtools/source/productregistration/registrationdlg.src +++ b/svtools/source/productregistration/registrationdlg.src @@ -72,6 +72,7 @@ ModalDialog DLG_REGISTRATION_REQUEST RadioButton RB_NOW { + HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_NOW"; Pos = MAP_APPFONT ( 33 , 41 ) ; Size = MAP_APPFONT ( 153 , 10 ) ; Text [ en-US ] = "Register now" ; @@ -79,18 +80,21 @@ ModalDialog DLG_REGISTRATION_REQUEST RadioButton RB_LATER { + HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_LATER"; Pos = MAP_APPFONT ( 33 , 54 ) ; Size = MAP_APPFONT ( 153 , 10 ) ; Text [ en-US ] = "Remind me to register later" ; }; RadioButton RB_NEVER { + HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_NEVER"; Pos = MAP_APPFONT ( 33 , 67 ) ; Size = MAP_APPFONT ( 153 , 10 ) ; Text [ en-US ] = "Never register" ; }; RadioButton RB_DONE { + HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_DONE"; Pos = MAP_APPFONT ( 33 , 80 ) ; Size = MAP_APPFONT ( 153 , 20 ) ; WordBreak = TRUE; diff --git a/svtools/source/toolpanel/drawerlayouter.cxx b/svtools/source/toolpanel/drawerlayouter.cxx index 040f33045fff..7fc7d05ea0c9 100644 --- a/svtools/source/toolpanel/drawerlayouter.cxx +++ b/svtools/source/toolpanel/drawerlayouter.cxx @@ -165,7 +165,7 @@ namespace svt OSL_PRECOND( i_nPosition <= m_aDrawers.size(), "DrawerDeckLayouter::PanelInserted: inconsistency!" ); PToolPanelDrawer pDrawer( new ToolPanelDrawer( m_rParentWindow, i_pPanel->GetDisplayName() ) ); - pDrawer->SetSmartHelpId( i_pPanel->GetHelpID() ); + pDrawer->SetHelpId( i_pPanel->GetHelpID() ); // proper Z-Order if ( i_nPosition == 0 ) { diff --git a/svtools/source/toolpanel/dummypanel.cxx b/svtools/source/toolpanel/dummypanel.cxx index 20f140a6e610..4de38b7f4bb3 100644 --- a/svtools/source/toolpanel/dummypanel.cxx +++ b/svtools/source/toolpanel/dummypanel.cxx @@ -80,9 +80,9 @@ namespace svt } //-------------------------------------------------------------------- - SmartId DummyPanel::GetHelpID() const + rtl::OString DummyPanel::GetHelpID() const { - return SmartId(); + return rtl::OString(); } //-------------------------------------------------------------------- diff --git a/svtools/source/toolpanel/dummypanel.hxx b/svtools/source/toolpanel/dummypanel.hxx index adb98e52077e..d2ca4480fce5 100644 --- a/svtools/source/toolpanel/dummypanel.hxx +++ b/svtools/source/toolpanel/dummypanel.hxx @@ -49,7 +49,7 @@ namespace svt // IToolPanel virtual ::rtl::OUString GetDisplayName() const; virtual Image GetImage() const; - virtual SmartId GetHelpID() const; + virtual rtl::OString GetHelpID() const; virtual void Activate( Window& i_rParentWindow ); virtual void Deactivate(); virtual void SetSizePixel( const Size& i_rPanelWindowSize ); diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index 147b11aceb11..ea147c5979d3 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -42,6 +42,7 @@ #include <rtl/strbuf.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> +#include <tools/urlobj.hxx> //...................................................................................................................... namespace svt { namespace uno @@ -206,11 +207,32 @@ namespace svt { namespace uno m_bInitialized = true; } + static rtl::OString lcl_getHelpId( const ::rtl::OUString& _rHelpURL ) + { + INetURLObject aHID( _rHelpURL ); + if ( aHID.GetProtocol() == INET_PROT_HID ) + return rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ); + else + return rtl::OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); + } + + //------------------------------------------------------------------------ + static ::rtl::OUString lcl_getHelpURL( const rtl::OString& sHelpId ) + { + ::rtl::OUStringBuffer aBuffer; + ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 ); + INetURLObject aHID( aTmp ); + if ( aHID.GetProtocol() == INET_PROT_NOT_VALID ) + aBuffer.appendAscii( INET_HID_SCHEME ); + aBuffer.append( aTmp.getStr() ); + return aBuffer.makeStringAndClear(); + } + //-------------------------------------------------------------------- Dialog* Wizard::createDialog( Window* i_pParent ) { WizardShell* pDialog( new WizardShell( i_pParent, this, m_xController, m_aWizardSteps ) ); - pDialog->SetSmartHelpId( SmartId( m_sHelpURL ) ); + pDialog->SetHelpId( lcl_getHelpId( m_sHelpURL ) ); pDialog->setTitleBase( m_sTitle ); return pDialog; } @@ -219,7 +241,7 @@ namespace svt { namespace uno void Wizard::destroyDialog() { if ( m_pDialog ) - m_sHelpURL = m_pDialog->GetSmartHelpId().GetStr(); + m_sHelpURL = lcl_getHelpURL( m_pDialog->GetHelpId() ); Wizard_Base::destroyDialog(); } @@ -279,8 +301,7 @@ namespace svt { namespace uno if ( !m_pDialog ) return m_sHelpURL; - const SmartId aSmartId( m_pDialog->GetSmartHelpId() ); - return aSmartId.GetStr(); + return lcl_getHelpURL( m_pDialog->GetHelpId() ); } //------------------------------------------------------------------------------------------------------------------ @@ -292,7 +313,7 @@ namespace svt { namespace uno if ( !m_pDialog ) m_sHelpURL = i_HelpURL; else - m_pDialog->SetSmartHelpId( SmartId( i_HelpURL ) ); + m_pDialog->SetHelpId( lcl_getHelpId( i_HelpURL ) ); } //------------------------------------------------------------------------------------------------------------------ diff --git a/svtools/util/hidother.src b/svtools/util/hidother.src index 77dd98115221..03aea7ebdf7e 100644 --- a/svtools/util/hidother.src +++ b/svtools/util/hidother.src @@ -57,3 +57,23 @@ hidspecial HID_PRINTDIALOG_TOFILE { HelpID = HID_PRINTDIALOG_TOFIL hidspecial HID_WIZARD_NEXT { HelpID = HID_WIZARD_NEXT; }; hidspecial HID_WIZARD_PREVIOUS { HelpID = HID_WIZARD_PREVIOUS; }; +hidspecial HID_FILEDLG_LINK_CB { HelpID = HID_FILEDLG_LINK_CB; }; +hidspecial HID_FILEDLG_PREVIEW_CB { HelpID = HID_FILEDLG_PREVIEW_CB; }; +hidspecial HID_FILEDLG_FILE { HelpID = HID_FILEDLG_FILE; }; +hidspecial HID_FILEDLG_MANAGER { HelpID = HID_FILEDLG_MANAGER; }; +hidspecial HID_FILEDLG_READ_ONLY { HelpID = HID_FILEDLG_READ_ONLY; }; +hidspecial HID_FILEDLG_STANDARD { HelpID = HID_FILEDLG_STANDARD; }; +hidspecial HID_FILEDLG_URL { HelpID = HID_FILEDLG_URL; }; +hidspecial HID_FILEDLG_USE_PASSWD { HelpID = HID_FILEDLG_USE_PASSWD; }; +hidspecial HID_FILEDLG_AUTOCOMPLETEBOX { HelpID = HID_FILEDLG_AUTOCOMPLETEBOX; }; +hidspecial HID_FILEDLG_SAVE_BTN { HelpID = HID_FILEDLG_SAVE_BTN; }; +hidspecial HID_FILEDLG_SAVE_FILENAME { HelpID = HID_FILEDLG_SAVE_FILENAME; }; +hidspecial HID_FILEDLG_SAVE_FILETYPE { HelpID = HID_FILEDLG_SAVE_FILETYPE; }; +hidspecial HID_FILEDLG_INSERT_BTN { HelpID = HID_FILEDLG_INSERT_BTN; }; +hidspecial HID_FILEDLG_PATH_BTN { HelpID = HID_FILEDLG_PATH_BTN; }; +hidspecial HID_FILEDLG_PATH_FILENAME { HelpID = HID_FILEDLG_PATH_FILENAME; }; +hidspecial HID_FILEDLG_FOLDER_BTN { HelpID = HID_FILEDLG_FOLDER_BTN; }; +hidspecial HID_FILEDLG_FOLDER_FILENAME { HelpID = HID_FILEDLG_FOLDER_FILENAME; }; +hidspecial HID_FILEDLG_SRCHFOLDER_BTN { HelpID = HID_FILEDLG_SRCHFOLDER_BTN; }; +hidspecial HID_FILEDLG_EDIT_FAVORITES_LISTBOX { HelpID = HID_FILEDLG_EDIT_FAVORITES_LISTBOX; }; +hidspecial HID_FILEDLG_EDIT_FAVORITES_HEADERBAR { HelpID = HID_FILEDLG_EDIT_FAVORITES_HEADERBAR; }; diff --git a/svtools/workben/toolpanel/toolpaneltest.cxx b/svtools/workben/toolpanel/toolpaneltest.cxx index 6d044cee7c93..6542fe826587 100755 --- a/svtools/workben/toolpanel/toolpaneltest.cxx +++ b/svtools/workben/toolpanel/toolpaneltest.cxx @@ -145,7 +145,7 @@ public: // IToolPanel virtual ::rtl::OUString GetDisplayName() const; virtual Image GetImage() const; - virtual SmartId GetHelpID() const; + virtual rtl::OString GetHelpID() const; virtual void Activate( Window& i_rParentWindow ); virtual void Deactivate(); virtual void SetSizePixel( const Size& i_rPanelWindowSize ); @@ -272,9 +272,9 @@ Image ColoredPanel::GetImage() const } //----------------------------------------------------------------------------- -SmartId ColoredPanel::GetHelpID() const +rtl::OString ColoredPanel::GetHelpID() const { - return SmartId(); + return rtl::OString(); } //============================================================================= diff --git a/svtools/workben/unodialog/roadmapskeleton.src b/svtools/workben/unodialog/roadmapskeleton.src index 797490273b5f..33728c700df6 100644 --- a/svtools/workben/unodialog/roadmapskeleton.src +++ b/svtools/workben/unodialog/roadmapskeleton.src @@ -31,6 +31,7 @@ // ----------------------------------------------------------------------------- ModalDialog DLG_ROADMAP_SKELETON { + HelpID = "svtools:ModalDialog:DLG_ROADMAP_SKELETON"; OutputSize = TRUE ; Moveable = TRUE; Closeable = TRUE ; @@ -61,24 +62,28 @@ ModalDialog DLG_ROADMAP_SKELETON TabPage TP_WELCOME { + HelpID = "svtools:TabPage:TP_WELCOME"; Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT ); Hide = TRUE; }; TabPage TP_PREPARE { + HelpID = "svtools:TabPage:TP_PREPARE"; Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT ); Hide = TRUE; }; TabPage TP_SETUP { + HelpID = "svtools:TabPage:TP_SETUP"; Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT ); Hide = TRUE; }; TabPage TP_FINISH { + HelpID = "svtools:TabPage:TP_FINISH"; Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT ); Hide = TRUE; }; diff --git a/toolkit/inc/layout/layout.hxx b/toolkit/inc/layout/layout.hxx index 78c7ea29272a..5d013e8a74c4 100644 --- a/toolkit/inc/layout/layout.hxx +++ b/toolkit/inc/layout/layout.hxx @@ -40,7 +40,6 @@ #include <vcl/combobox.h> #include <vcl/fldunit.hxx> #include <vcl/lstbox.h> -#include <vcl/smartid.hxx> #include <vcl/wintypes.hxx> class Button; @@ -162,10 +161,8 @@ public: String GetText() const; void SetStyle( WinBits style ); void SetUpdateMode( bool mode ); - void SetHelpId( sal_uIntPtr id ); - sal_uIntPtr GetHelpId() const; - void SetSmartHelpId( SmartId const&, SmartIdUpdateMode mode=SMART_SET_SMART ); - SmartId GetSmartHelpId() const; + void SetHelpId( const rtl::OString& id ); + const rtl::OString& GetHelpId() const; void EnterWait (); void LeaveWait (); bool IsWait () const; @@ -582,20 +579,20 @@ public: #define DECL_MESSAGE_BOX_CTORS(Name)\ public:\ Name##Box (::Window *parent, char const* message,\ - char const* yes=0, char const* no=0, sal_uIntPtr help_id=0,\ + char const* yes=0, char const* no=0, const rtl::OString& help_id=rtl::OString(),\ char const* xml_file="message-box.xml", char const* id="message-box");\ Name##Box (::Window *parent, rtl::OUString const& message,\ rtl::OUString yes=String (),\ rtl::OUString no=String (),\ - sal_uIntPtr help_id=0,\ + const rtl::OString& help_id=rtl::OString(),\ char const* xml_file="message-box.xml", char const* id="message-box");\ Name##Box (::Window *parent, WinBits, char const* message,\ - char const* yes=0, char const* no=0, sal_uIntPtr help_id=0,\ + char const* yes=0, char const* no=0, const rtl::OString& help_id=rtl::OString(),\ char const* xml_file="message-box.xml", char const* id="message-box");\ Name##Box (::Window *parent, WinBits, rtl::OUString const& message,\ rtl::OUString yes=String (),\ rtl::OUString no=String (),\ - sal_uIntPtr help_id=0,\ + const rtl::OString& help_id=rtl::OString(),\ char const* xml_file="message-box.xml", char const* id="message-box")\ class TOOLKIT_DLLPUBLIC MessageBox : public Dialog @@ -616,10 +613,10 @@ protected: YesButton yesButton; void bits_init (WinBits bits, rtl::OUString const& message, - rtl::OUString yes, rtl::OUString, sal_uIntPtr help_id); + rtl::OUString yes, rtl::OUString, const rtl::OString& help_id); void init (rtl::OUString const& message, - rtl::OUString const& yes, rtl::OUString const& no, sal_uIntPtr help_id); - void init (char const* message, char const* yes, char const* no, sal_uIntPtr help_id); + rtl::OUString const& yes, rtl::OUString const& no, const rtl::OString& help_id); + void init (char const* message, char const* yes, char const* no, const rtl::OString& help_id); }; #define CLASS_MESSAGE_BOX(Name)\ diff --git a/toolkit/inc/toolkit/awt/vclxwindows.hxx b/toolkit/inc/toolkit/awt/vclxwindows.hxx index fb110cb74391..36ac2fa51337 100644 --- a/toolkit/inc/toolkit/awt/vclxwindows.hxx +++ b/toolkit/inc/toolkit/awt/vclxwindows.hxx @@ -395,7 +395,7 @@ public: // ::com::sun::star::awt::XDialog2 virtual void SAL_CALL endDialog( ::sal_Int32 Result ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHelpId( ::sal_Int32 Id ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHelpId( const rtl::OUString& Id ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XDialog void SAL_CALL setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/controls/dialogcontrol.hxx b/toolkit/inc/toolkit/controls/dialogcontrol.hxx index 0c5731d3f923..f6a0f768bc10 100644 --- a/toolkit/inc/toolkit/controls/dialogcontrol.hxx +++ b/toolkit/inc/toolkit/controls/dialogcontrol.hxx @@ -274,7 +274,7 @@ public: // ::com::sun::star::awt::XDialog2 virtual void SAL_CALL endDialog( ::sal_Int32 Result ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHelpId( ::sal_Int32 Id ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHelpId( const rtl::OUString& Id ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XDialog void SAL_CALL setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/source/awt/vclxdialog.cxx b/toolkit/source/awt/vclxdialog.cxx index 43861c3ed347..70ebade69ddc 100644 --- a/toolkit/source/awt/vclxdialog.cxx +++ b/toolkit/source/awt/vclxdialog.cxx @@ -206,13 +206,13 @@ void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star pWindow->SetText( Title ); } -void VCLXDialog::setHelpId( sal_Int32 id ) throw(::com::sun::star::uno::RuntimeException) +void VCLXDialog::setHelpId( const rtl::OUString& rId ) throw(::com::sun::star::uno::RuntimeException) { ::vos::OGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) - pWindow->SetHelpId( id ); + pWindow->SetHelpId( rtl::OUStringToOString( rId, RTL_TEXTENCODING_UTF8 ) ); } ::rtl::OUString VCLXDialog::getTitle() throw(::com::sun::star::uno::RuntimeException) diff --git a/toolkit/source/awt/vclxdialog.hxx b/toolkit/source/awt/vclxdialog.hxx index 64b2c03f90d5..9d52064c68bf 100644 --- a/toolkit/source/awt/vclxdialog.hxx +++ b/toolkit/source/awt/vclxdialog.hxx @@ -98,7 +98,7 @@ public: // ::com::sun::star::awt::XDialog2 void SAL_CALL endDialog( sal_Int32 nResult ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setHelpId( sal_Int32 id ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setHelpId( const rtl::OUString& id ) throw(::com::sun::star::uno::RuntimeException); }; diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 1022d78a43ed..808f3578ef97 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -67,7 +67,7 @@ #include <comphelper/asyncnotification.hxx> #include <toolkit/helper/solarrelease.hxx> #include "stylesettings.hxx" - +#include <tools/urlobj.hxx> #include <toolkit/helper/unopropertyarrayhelper.hxx> #include <boost/bind.hpp> @@ -1600,17 +1600,11 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com:: ::rtl::OUString aURL; if ( Value >>= aURL ) { - String aHelpURL( aURL ); - String aPattern( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) ); - if ( aHelpURL.CompareIgnoreCaseToAscii( aPattern, aPattern.Len() ) == COMPARE_EQUAL ) - { - String aID = aHelpURL.Copy( aPattern.Len() ); - pWindow->SetHelpId( aID.ToInt32() ); - } + INetURLObject aHelpURL( aURL ); + if ( aHelpURL.GetProtocol() == INET_PROT_HID ) + pWindow->SetHelpId( rtl::OUStringToOString( aHelpURL.GetURLPath(), RTL_TEXTENCODING_UTF8 ) ); else - { - pWindow->SetSmartHelpId( SmartId( aHelpURL ) ); - } + pWindow->SetHelpId( rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ) ); } } break; @@ -2081,19 +2075,8 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com:: break; case BASEPROPERTY_HELPURL: { - SmartId aSmartId = GetWindow()->GetSmartHelpId(); - if( aSmartId.HasString() ) - { - String aStrHelpId = aSmartId.GetStr(); - aProp <<= ::rtl::OUString( aStrHelpId ); - } - else - { - ::rtl::OUStringBuffer aURL; - aURL.appendAscii( "HID:" ); - aURL.append( (sal_Int32) GetWindow()->GetHelpId() ); - aProp <<= aURL.makeStringAndClear(); - } + rtl::OUString aHelpId( rtl::OStringToOUString( GetWindow()->GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); + aProp <<= ::rtl::OUString( aHelpId ); } break; case BASEPROPERTY_FONTDESCRIPTOR: diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index db34c840f8eb..06c9167336a8 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -2324,13 +2324,13 @@ void SAL_CALL VCLXDialog::endDialog( ::sal_Int32 i_result ) throw (RuntimeExcept pDialog->EndDialog( i_result ); } -void SAL_CALL VCLXDialog::setHelpId( ::sal_Int32 i_id ) throw (RuntimeException) +void SAL_CALL VCLXDialog::setHelpId( const ::rtl::OUString& rId ) throw (RuntimeException) { ::vos::OGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) - pWindow->SetHelpId( i_id ); + pWindow->SetHelpId( rtl::OUStringToOString( rId, RTL_TEXTENCODING_UTF8 ) ); } void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star::uno::RuntimeException) diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index c54549baed5e..ecb4d7765723 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -1990,7 +1990,7 @@ void SAL_CALL UnoDialogControl::endDialog( ::sal_Int32 i_result ) throw (Runtime xPeerDialog->endDialog( i_result ); } -void SAL_CALL UnoDialogControl::setHelpId( ::sal_Int32 i_id ) throw (RuntimeException) +void SAL_CALL UnoDialogControl::setHelpId( const rtl::OUString& i_id ) throw (RuntimeException) { Reference< XDialog2 > xPeerDialog( getPeer(), UNO_QUERY ); if ( xPeerDialog.is() ) diff --git a/toolkit/source/layout/core/import.cxx b/toolkit/source/layout/core/import.cxx index 6d161cf1b07e..84e46f5b68f1 100644 --- a/toolkit/source/layout/core/import.cxx +++ b/toolkit/source/layout/core/import.cxx @@ -101,7 +101,7 @@ SAL_THROW (()) if ( findAndRemove( "help-id", aProps, aHelpId ) ) { OSL_TRACE("Setting help-id: %s", OUSTRING_CSTR( aHelpId ) ); - xDialog->setHelpId( aHelpId.toInt32 () ); + xDialog->setHelpId( aHelpId ); } } // DEBUG: else if ( pParent == NULL ) diff --git a/toolkit/source/layout/vcl/wrapper.cxx b/toolkit/source/layout/vcl/wrapper.cxx index a8133250eb58..3b23ee92636b 100644 --- a/toolkit/source/layout/vcl/wrapper.cxx +++ b/toolkit/source/layout/vcl/wrapper.cxx @@ -304,13 +304,17 @@ void Window::setRes (ResId const& res) { return Resource::ReadStringRes (); } + rtl::OString ReadByteStringRes() + { + return Resource::ReadByteStringRes(); + } }; Resource_open_up r (res); #endif /* !RESOURCE_PUBLISH_PROTECTED */ - if (sal_uInt32 help_id = (sal_uInt32)r.GetLongRes (static_cast<char *> (r.GetClassRes ()) + 12)) - SetHelpId (help_id); sal_uInt32 mask = r.ReadLongRes (); + if (mask & WINDOW_HELPID) + SetHelpId (r.ReadByteStringRes()); if ( mask & WINDOW_TEXT ) SetText( r.ReadStringRes ()); } @@ -366,26 +370,16 @@ VCLXWindow* Window::GetVCLXWindow() const return GetWindow()->GetParent(); } -void Window::SetHelpId( sal_uIntPtr id ) +void Window::SetHelpId( const rtl::OString& id ) { GetWindow()->SetHelpId( id ); } -sal_uIntPtr Window::GetHelpId() const +const rtl::OString& Window::GetHelpId() const { return GetWindow()->GetHelpId(); } -void Window::SetSmartHelpId( SmartId const& id, SmartIdUpdateMode mode ) -{ - GetWindow()->SetSmartHelpId( id, mode ); -} - -SmartId Window::GetSmartHelpId() const -{ - return GetWindow()->GetSmartHelpId(); -} - void Window::EnterWait () { GetWindow()->EnterWait (); @@ -866,7 +860,7 @@ void Dialog::Initialize (SfxChildWinInfo*) , yesButton (this, "BTN_YES") MessageBox::MessageBox (::Window *parent, char const* message, - char const* yes, char const* no, sal_uIntPtr help_id, + char const* yes, char const* no, const rtl::OString& help_id, char const* xml_file, char const* id) : MESSAGE_BOX_MEMBER_INIT { @@ -876,7 +870,7 @@ MessageBox::MessageBox (::Window *parent, char const* message, } MessageBox::MessageBox (::Window *parent, OUString const& message, - OUString yes, OUString no, sal_uIntPtr help_id, + OUString yes, OUString no, const rtl::OString& help_id, char const* xml_file, char const* id) : MESSAGE_BOX_MEMBER_INIT { @@ -890,7 +884,7 @@ MessageBox::MessageBox (::Window *parent, OUString const& message, #endif /* !__GNUC__ */ MessageBox::MessageBox (::Window *parent, WinBits bits, char const* message, - char const* yes, char const* no, sal_uIntPtr help_id, + char const* yes, char const* no, const rtl::OString& help_id, char const* xml_file, char const* id) : MESSAGE_BOX_MEMBER_INIT { @@ -903,7 +897,7 @@ MessageBox::MessageBox (::Window *parent, WinBits bits, char const* message, } MessageBox::MessageBox (::Window *parent, WinBits bits, OUString const& message, - OUString yes, OUString no, sal_uIntPtr help_id, + OUString yes, OUString no, const rtl::OString& help_id, char const* xml_file, char const* id) : MESSAGE_BOX_MEMBER_INIT { @@ -916,7 +910,7 @@ MessageBox::MessageBox (::Window *parent, WinBits bits, OUString const& message, } void MessageBox::bits_init (WinBits bits, OUString const& message, - OUString yes, OUString no, sal_uIntPtr help_id) + OUString yes, OUString no, const rtl::OString& help_id) { if ( bits & ( WB_OK_CANCEL | WB_OK )) yes = Button::GetStandardText ( BUTTON_OK ); @@ -941,12 +935,12 @@ void MessageBox::bits_init (WinBits bits, OUString const& message, init (message, yes, no, help_id); } -void MessageBox::init (char const* message, char const* yes, char const* no, sal_uIntPtr help_id) +void MessageBox::init (char const* message, char const* yes, char const* no, const rtl::OString& help_id) { init ( OUString::createFromAscii (message), OUString::createFromAscii (yes), OUString::createFromAscii (no), help_id); } -void MessageBox::init (OUString const& message, OUString const& yes, OUString const& no, sal_uIntPtr help_id) +void MessageBox::init (OUString const& message, OUString const& yes, OUString const& no, const rtl::OString& help_id) { imageError.Hide (); imageInfo.Hide (); @@ -974,28 +968,28 @@ void MessageBox::init (OUString const& message, OUString const& yes, OUString co #undef MESSAGE_BOX_IMPL #define MESSAGE_BOX_IMPL(Name)\ Name##Box::Name##Box (::Window *parent, char const* message,\ - char const* yes, char const* no, sal_uIntPtr help_id,\ + char const* yes, char const* no, const rtl::OString& help_id,\ char const* xml_file, char const* id)\ : MessageBox (parent, message, yes, no, help_id, xml_file, id)\ {\ image##Name.Show ();\ }\ Name##Box::Name##Box (::Window *parent, OUString const& message,\ - OUString yes, OUString no, sal_uIntPtr help_id,\ + OUString yes, OUString no, const rtl::OString& help_id,\ char const* xml_file, char const* id)\ : MessageBox (parent, message, yes, no, help_id, xml_file, id)\ {\ image##Name.Show ();\ }\ Name##Box::Name##Box (::Window *parent, WinBits bits, char const* message,\ - char const* yes, char const* no, sal_uIntPtr help_id,\ + char const* yes, char const* no, const rtl::OString& help_id,\ char const* xml_file, char const* id)\ : MessageBox (parent, bits, message, yes, no, help_id, xml_file, id)\ {\ image##Name.Show ();\ }\ Name##Box::Name##Box (::Window *parent, WinBits bits, OUString const& message,\ - OUString yes, OUString no, sal_uIntPtr help_id,\ + OUString yes, OUString no, const rtl::OString& help_id,\ char const* xml_file, char const* id)\ : MessageBox (parent, bits, message, yes, no, help_id, xml_file, id)\ {\ diff --git a/toolkit/workben/layout/sortdlg.src b/toolkit/workben/layout/sortdlg.src index 5e855962af96..e9e2b7a0a26b 100644 --- a/toolkit/workben/layout/sortdlg.src +++ b/toolkit/workben/layout/sortdlg.src @@ -33,6 +33,7 @@ TabPage RID_SCPAGE_SORT_FIELDS Size = MAP_APPFONT ( 260 , 185 ) ; ListBox LB_SORT1 { + HelpID = "toolkit:ListBox:RID_SCPAGE_SORT_FIELDS:LB_SORT1"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 19 ) ; Size = MAP_APPFONT ( 154 , 90 ) ; @@ -41,6 +42,7 @@ TabPage RID_SCPAGE_SORT_FIELDS }; RadioButton BTN_UP1 { + HelpID = "toolkit:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_UP1"; Pos = MAP_APPFONT ( 172 , 14 ) ; Size = MAP_APPFONT ( 79 , 10 ) ; Text [ en-US ] = "~Ascending" ; @@ -48,6 +50,7 @@ TabPage RID_SCPAGE_SORT_FIELDS }; RadioButton BTN_DOWN1 { + HelpID = "toolkit:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_DOWN1"; Pos = MAP_APPFONT ( 172 , 28 ) ; Size = MAP_APPFONT ( 79 , 10 ) ; Text [ en-US ] = "~Descending" ; @@ -61,6 +64,7 @@ TabPage RID_SCPAGE_SORT_FIELDS }; ListBox LB_SORT2 { + HelpID = "toolkit:ListBox:RID_SCPAGE_SORT_FIELDS:LB_SORT2"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 60 ) ; Size = MAP_APPFONT ( 154 , 90 ) ; @@ -69,6 +73,7 @@ TabPage RID_SCPAGE_SORT_FIELDS }; RadioButton BTN_UP2 { + HelpID = "toolkit:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_UP2"; Pos = MAP_APPFONT ( 172 , 55 ) ; Size = MAP_APPFONT ( 79 , 10 ) ; Text [ en-US ] = "A~scending" ; @@ -76,6 +81,7 @@ TabPage RID_SCPAGE_SORT_FIELDS }; RadioButton BTN_DOWN2 { + HelpID = "toolkit:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_DOWN2"; Pos = MAP_APPFONT ( 172 , 69 ) ; Size = MAP_APPFONT ( 79 , 10 ) ; Text [ en-US ] = "D~escending" ; @@ -89,6 +95,7 @@ TabPage RID_SCPAGE_SORT_FIELDS }; ListBox LB_SORT3 { + HelpID = "toolkit:ListBox:RID_SCPAGE_SORT_FIELDS:LB_SORT3"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 101 ) ; Size = MAP_APPFONT ( 154 , 90 ) ; @@ -97,6 +104,7 @@ TabPage RID_SCPAGE_SORT_FIELDS }; RadioButton BTN_UP3 { + HelpID = "toolkit:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_UP3"; Pos = MAP_APPFONT ( 172 , 96 ) ; Size = MAP_APPFONT ( 79 , 10 ) ; Text [ en-US ] = "As~cending" ; @@ -104,6 +112,7 @@ TabPage RID_SCPAGE_SORT_FIELDS }; RadioButton BTN_DOWN3 { + HelpID = "toolkit:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_DOWN3"; Pos = MAP_APPFONT ( 172 , 110 ) ; Size = MAP_APPFONT ( 79 , 10 ) ; Text [ en-US ] = "Desce~nding" ; @@ -125,6 +134,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS Size = MAP_APPFONT ( 260 , 185 ) ; CheckBox BTN_CASESENSITIVE { + HelpID = "toolkit:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_CASESENSITIVE"; Pos = MAP_APPFONT ( 12 , 6 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text [ en-US ] = "Case ~sensitive" ; @@ -132,6 +142,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; CheckBox BTN_LABEL { + HelpID = "toolkit:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_LABEL"; Pos = MAP_APPFONT ( 12 , 20 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -146,6 +157,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; CheckBox BTN_FORMATS { + HelpID = "toolkit:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_FORMATS"; Pos = MAP_APPFONT ( 12 , 34 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text [ en-US ] = "Include ~formats" ; @@ -153,6 +165,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; CheckBox BTN_NATURALSORT { + HelpID = "toolkit:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_NATURALSORT"; Pos = MAP_APPFONT ( 12 , 48 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text [ de ] = "Enable ~natural sort" ; @@ -164,6 +177,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; CheckBox BTN_COPYRESULT { + HelpID = "toolkit:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_COPYRESULT"; Pos = MAP_APPFONT ( 12 , 62 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text [ en-US ] = "~Copy sort results to:" ; @@ -171,6 +185,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; ListBox LB_OUTAREA { + HelpID = "toolkit:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_OUTAREA"; Border = TRUE ; Pos = MAP_APPFONT ( 20 , 73 ) ; Size = MAP_APPFONT ( 93 , 90 ) ; @@ -179,6 +194,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; Edit ED_OUTAREA { + HelpID = "toolkit:Edit:RID_SCPAGE_SORT_OPTIONS:ED_OUTAREA"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 119 , 73 ) ; @@ -187,6 +203,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; CheckBox BTN_SORT_USER { + HelpID = "toolkit:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_SORT_USER"; Pos = MAP_APPFONT ( 12 , 89 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text [ en-US ] = "Custom sort ~order" ; @@ -194,6 +211,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; ListBox LB_SORT_USER { + HelpID = "toolkit:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_SORT_USER"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 20 , 100 ) ; @@ -209,6 +227,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; ListBox LB_LANGUAGE { + HelpID = "toolkit:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_LANGUAGE"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 129 ) ; Size = MAP_APPFONT ( 101 , 90 ) ; @@ -224,6 +243,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; ListBox LB_ALGORITHM { + HelpID = "toolkit:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_ALGORITHM"; Border = TRUE ; Pos = MAP_APPFONT ( 119 , 129 ) ; Size = MAP_APPFONT ( 132 , 90 ) ; @@ -238,6 +258,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; RadioButton BTN_TOP_DOWN { + HelpID = "toolkit:RadioButton:RID_SCPAGE_SORT_OPTIONS:BTN_TOP_DOWN"; Pos = MAP_APPFONT ( 12 , 158 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text [ en-US ] = "~Top to bottom (sort rows)" ; @@ -245,6 +266,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; RadioButton BTN_LEFT_RIGHT { + HelpID = "toolkit:RadioButton:RID_SCPAGE_SORT_OPTIONS:BTN_LEFT_RIGHT"; Pos = MAP_APPFONT ( 12 , 172 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text [ en-US ] = "L~eft to right (sort columns)" ; diff --git a/tools/inc/tools/rc.h b/tools/inc/tools/rc.h index bd499717a3a4..e11aed2937fd 100644 --- a/tools/inc/tools/rc.h +++ b/tools/inc/tools/rc.h @@ -50,6 +50,7 @@ typedef short RSWND_STYLE; #define WINDOW_EXTRALONG 0x0800 #define WINDOW_UNIQUEID 0x1000 #define WINDOW_BORDER_STYLE 0x2000 +#define WINDOW_HELPID 0x4000 // Definition der Struktur die alle "WorkWindow"-Resourcen haben #define WORKWIN_SHOWNORMAL 0 diff --git a/tools/inc/tools/rc.hxx b/tools/inc/tools/rc.hxx index 4bf1827a1ab6..15e077c3c62c 100644 --- a/tools/inc/tools/rc.hxx +++ b/tools/inc/tools/rc.hxx @@ -87,6 +87,9 @@ class TOOLS_DLLPUBLIC Resource // read a string from resource data and increment pointer UniString ReadStringRes() { return m_pResMgr->ReadString(); } + // read a byte string from resource data and increment pointer + rtl::OString ReadByteStringRes() + { return m_pResMgr->ReadByteString(); } // Gibt die Resource frei (this-Zeiger fuer Fehlerueberpruefung) // free the resource from m_pResMgr's stack (pass this ptr for validation) diff --git a/tools/inc/tools/resmgr.hxx b/tools/inc/tools/resmgr.hxx index b19524139078..4b79040921b3 100644 --- a/tools/inc/tools/resmgr.hxx +++ b/tools/inc/tools/resmgr.hxx @@ -181,13 +181,15 @@ public: static sal_uInt32 GetObjSize( RSHEADER_TYPE* pHT ) { return( pHT->GetGlobOff() ); } - // Liefert einen String aus der Resource + // returns a string and its length out of the resource static sal_uInt32 GetString( UniString& rStr, const BYTE* pStr ); + // returns a byte string and its length out of the resource + static sal_uInt32 GetByteString( rtl::OString& rStr, const BYTE* pStr ); // Groesse eines Strings in der Resource static sal_uInt32 GetStringSize( sal_uInt32 nLen ) { nLen++; return (nLen + nLen%2); } - static sal_uInt32 GetStringSize( const BYTE* pStr ); + static sal_uInt32 GetStringSize( const BYTE* pStr, sal_uInt32& nLen ); // return a int64 static sal_uInt64 GetUInt64( void* pDatum ); @@ -209,9 +211,10 @@ public: INT16 ReadShort(); INT32 ReadLong(); UniString ReadString(); + rtl::OString ReadByteString(); - // generate auto help id for current resource stack - ULONG GetAutoHelpId(); + // generate auto help id for current resource stack + rtl::OString GetAutoHelpId(); static void SetReadStringHook( ResHookProc pProc ); static ResHookProc GetReadStringHook(); diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx index 17d52432e206..cb9c7e407bcc 100644 --- a/tools/inc/tools/urlobj.hxx +++ b/tools/inc/tools/urlobj.hxx @@ -81,6 +81,7 @@ namespace com { namespace sun { namespace star { namespace util { #define INET_DB_SCHEME "db:" #define INET_BUGID_SCHEME "bugid:" #define INET_TELNET_SCHEME "telnet://" +#define INET_HID_SCHEME "hid:" #define URL_PREFIX_PRIV_SOFFICE "private:" enum @@ -139,7 +140,8 @@ enum INetProtocol INET_PROT_VND_SUN_STAR_TDOC = 29, INET_PROT_GENERIC = 30, INET_PROT_SMB = 31, - INET_PROT_END = 32 + INET_PROT_HID = 32, + INET_PROT_END = 33 }; //============================================================================ diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index a6d7bc6fd04e..56e6b8ef47cc 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -424,7 +424,9 @@ static INetURLObject::SchemeInfo const aSchemeInfoMap[INET_PROT_END] false, false, false, true, false }, { "", "", 0, false, false, false, false, true, true, true, false }, { "smb", "smb://", 139, true, true, false, true, true, true, true, - true } }; + true }, + { "hid", "hid:", 0, false, false, false, false, false, false, + false, true } }; // static inline INetURLObject::SchemeInfo const & @@ -2094,6 +2096,8 @@ INetURLObject::getPrefix(sal_Unicode const *& rBegin, { "db:", "staroffice.db:", INET_PROT_DB, PrefixInfo::INTERNAL }, { "file:", 0, INET_PROT_FILE, PrefixInfo::OFFICIAL }, { "ftp:", 0, INET_PROT_FTP, PrefixInfo::OFFICIAL }, + { "hid:", "staroffice.hid:", INET_PROT_HID, + PrefixInfo::INTERNAL }, { "http:", 0, INET_PROT_HTTP, PrefixInfo::OFFICIAL }, { "https:", 0, INET_PROT_HTTPS, PrefixInfo::OFFICIAL }, { "imap:", 0, INET_PROT_IMAP, PrefixInfo::OFFICIAL }, @@ -2129,6 +2133,8 @@ INetURLObject::getPrefix(sal_Unicode const *& rBegin, INET_PROT_PRIV_SOFFICE, PrefixInfo::EXTERNAL }, { "staroffice.helpid:", "private:helpid/", INET_PROT_PRIV_SOFFICE, PrefixInfo::EXTERNAL }, + { "staroffice.hid:", "hid:", INET_PROT_HID, + PrefixInfo::EXTERNAL }, { "staroffice.java:", "private:java/", INET_PROT_PRIV_SOFFICE, PrefixInfo::EXTERNAL }, { "staroffice.macro:", "macro:", INET_PROT_MACRO, @@ -3120,6 +3126,7 @@ bool INetURLObject::parsePath(INetProtocol eScheme, case INET_PROT_PRIV_SOFFICE: case INET_PROT_SLOT: + case INET_PROT_HID: case INET_PROT_MACRO: case INET_PROT_UNO: case INET_PROT_COMPONENT: diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index d05fcac331f2..2e6401f5a19f 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -46,6 +46,7 @@ #include <osl/file.hxx> #include <osl/mutex.hxx> #include <rtl/ustrbuf.hxx> +#include <rtl/strbuf.hxx> #include <tools/urlobj.hxx> #include <rtl/instance.hxx> #include <rtl/bootstrap.hxx> @@ -1351,7 +1352,8 @@ sal_uInt64 ResMgr::GetUInt64( void* pDatum ) // ----------------------------------------------------------------------- sal_uInt32 ResMgr::GetStringWithoutHook( UniString& rStr, const BYTE* pStr ) { - sal_uInt32 nRet = GetStringSize( pStr ); + sal_uInt32 nLen=0; + sal_uInt32 nRet = GetStringSize( pStr, nLen ); UniString aString( (sal_Char*)pStr, RTL_TEXTENCODING_UTF8, RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT | @@ -1370,11 +1372,20 @@ sal_uInt32 ResMgr::GetString( UniString& rStr, const BYTE* pStr ) return nRet; } +sal_uInt32 ResMgr::GetByteString( rtl::OString& rStr, const BYTE* pStr ) +{ + sal_uInt32 nLen=0; + sal_uInt32 nRet = GetStringSize( pStr, nLen ); + rStr = rtl::OString( (const sal_Char*)pStr, nLen ); + return nRet; +} + // ------------------------------------------------------------------ -sal_uInt32 ResMgr::GetStringSize( const BYTE* pStr ) +sal_uInt32 ResMgr::GetStringSize( const BYTE* pStr, sal_uInt32& nLen ) { - return GetStringSize( strlen( (const char*)pStr ) ); + nLen = static_cast< sal_uInt32 >( strlen( (const char*)pStr ) ); + return GetStringSize( nLen ); } // ----------------------------------------------------------------------- @@ -1765,90 +1776,125 @@ UniString ResMgr::ReadString() return aRet; } +rtl::OString ResMgr::ReadByteString() +{ + osl::Guard<osl::Mutex> aGuard( getResMgrMutex() ); + + if( pFallbackResMgr ) + return pFallbackResMgr->ReadByteString(); + + rtl::OString aRet; + + const ImpRCStack& rTop = aStack[nCurStack]; + if( (rTop.Flags & RC_NOTFOUND) ) + { + #if OSL_DEBUG_LEVEL > 0 + aRet = OString( "<resource not found>" ); + #endif + } + else + Increment( GetByteString( aRet, (const BYTE*)GetClass() ) ); + + return aRet; +} + // ----------------------------------------------------------------------- -ULONG ResMgr::GetAutoHelpId() +rtl::OString ResMgr::GetAutoHelpId() { osl::Guard<osl::Mutex> aGuard( getResMgrMutex() ); if( pFallbackResMgr ) return pFallbackResMgr->GetAutoHelpId(); - DBG_ASSERT( nCurStack, "resource stack empty in Auto help id generation" ); + OSL_ENSURE( nCurStack, "resource stack empty in Auto help id generation" ); if( nCurStack < 1 || nCurStack > 2 ) - return 0; - - const ImpRCStack *pRC = StackTop( nCurStack==1 ? 0 : 1 ); - - DBG_ASSERT( pRC->pResource, "MM hat gesagt, dass der immer einen hat" ); - ULONG nGID = pRC->pResource->GetId(); - - if( !nGID || nGID > 32767 ) - return 0; - - ULONG nHID = 0; - - // GGGg gggg::gggg gggg::ggLL LLLl::llll llll - switch( pRC->pResource->GetRT() ) { // maximal 7 - case RSC_DOCKINGWINDOW: - nHID += 0x20000000L; - case RSC_WORKWIN: - nHID += 0x20000000L; - case RSC_MODELESSDIALOG: - nHID += 0x20000000L; - case RSC_FLOATINGWINDOW: - nHID += 0x20000000L; - case RSC_MODALDIALOG: - nHID += 0x20000000L; - case RSC_TABPAGE: - nHID += 0x20000000L; - - if( nCurStack == 2 ) { - pRC = StackTop(); - ULONG nLID = pRC->pResource->GetId(); - - if( !nLID || nLID > 511 ) - return 0; - - switch( pRC->pResource->GetRT() ) { // maximal 32 - case RSC_TABCONTROL: nHID |= 0x0000; break; - case RSC_RADIOBUTTON: nHID |= 0x0200; break; - case RSC_CHECKBOX: nHID |= 0x0400; break; - case RSC_TRISTATEBOX: nHID |= 0x0600; break; - case RSC_EDIT: nHID |= 0x0800; break; - case RSC_MULTILINEEDIT: nHID |= 0x0A00; break; - case RSC_MULTILISTBOX: nHID |= 0x0C00; break; - case RSC_LISTBOX: nHID |= 0x0E00; break; - case RSC_COMBOBOX: nHID |= 0x1000; break; - case RSC_PUSHBUTTON: nHID |= 0x1200; break; - case RSC_SPINFIELD: nHID |= 0x1400; break; - case RSC_PATTERNFIELD: nHID |= 0x1600; break; - case RSC_NUMERICFIELD: nHID |= 0x1800; break; - case RSC_METRICFIELD: nHID |= 0x1A00; break; - case RSC_CURRENCYFIELD: nHID |= 0x1C00; break; - case RSC_DATEFIELD: nHID |= 0x1E00; break; - case RSC_TIMEFIELD: nHID |= 0x2000; break; - case RSC_IMAGERADIOBUTTON: nHID |= 0x2200; break; - case RSC_NUMERICBOX: nHID |= 0x2400; break; - case RSC_METRICBOX: nHID |= 0x2600; break; - case RSC_CURRENCYBOX: nHID |= 0x2800; break; - case RSC_DATEBOX: nHID |= 0x2A00; break; - case RSC_TIMEBOX: nHID |= 0x2C00; break; - case RSC_IMAGEBUTTON: nHID |= 0x2E00; break; - case RSC_MENUBUTTON: nHID |= 0x3000; break; - case RSC_MOREBUTTON: nHID |= 0x3200; break; + return rtl::OString(); + + // prepare HID, start with resource prefix + rtl::OStringBuffer aHID( 32 ); + aHID.append( rtl::OUStringToOString( pImpRes->aPrefix, RTL_TEXTENCODING_UTF8 ) ); + aHID.append( '.' ); + + // append type + const ImpRCStack *pRC = StackTop(); + OSL_ENSURE( pRC, "missing resource stack level" ); + + if ( nCurStack == 1 ) + { + // auto help ids for top level windows + switch( pRC->pResource->GetRT() ) { + case RSC_DOCKINGWINDOW: aHID.append( "DockingWindow" ); break; + case RSC_WORKWIN: aHID.append( "WorkWindow" ); break; + case RSC_MODELESSDIALOG: aHID.append( "ModelessDialog" ); break; + case RSC_FLOATINGWINDOW: aHID.append( "FloatingWindow" ); break; + case RSC_MODALDIALOG: aHID.append( "ModalDialog" ); break; + case RSC_TABPAGE: aHID.append( "TabPage" ); break; + default: return rtl::OString(); + } + } + else + { + // only controls with the following parents get auto help ids + const ImpRCStack *pRC1 = StackTop(1); + switch( pRC1->pResource->GetRT() ) { + case RSC_DOCKINGWINDOW: + case RSC_WORKWIN: + case RSC_MODELESSDIALOG: + case RSC_FLOATINGWINDOW: + case RSC_MODALDIALOG: + case RSC_TABPAGE: + // intentionally no breaks! + // auto help ids for controls + switch( pRC->pResource->GetRT() ) { + case RSC_TABCONTROL: aHID.append( "TabControl" ); break; + case RSC_RADIOBUTTON: aHID.append( "RadioButton" ); break; + case RSC_CHECKBOX: aHID.append( "CheckBox" ); break; + case RSC_TRISTATEBOX: aHID.append( "TriStateBox" ); break; + case RSC_EDIT: aHID.append( "Edit" ); break; + case RSC_MULTILINEEDIT: aHID.append( "MultiLineEdit" ); break; + case RSC_MULTILISTBOX: aHID.append( "MultiListBox" ); break; + case RSC_LISTBOX: aHID.append( "ListBox" ); break; + case RSC_COMBOBOX: aHID.append( "ComboBox" ); break; + case RSC_PUSHBUTTON: aHID.append( "PushButton" ); break; + case RSC_SPINFIELD: aHID.append( "SpinField" ); break; + case RSC_PATTERNFIELD: aHID.append( "PatternField" ); break; + case RSC_NUMERICFIELD: aHID.append( "NumericField" ); break; + case RSC_METRICFIELD: aHID.append( "MetricField" ); break; + case RSC_CURRENCYFIELD: aHID.append( "CurrencyField" ); break; + case RSC_DATEFIELD: aHID.append( "DateField" ); break; + case RSC_TIMEFIELD: aHID.append( "TimeField" ); break; + case RSC_IMAGERADIOBUTTON: aHID.append( "ImageRadioButton" ); break; + case RSC_NUMERICBOX: aHID.append( "NumericBox" ); break; + case RSC_METRICBOX: aHID.append( "MetricBox" ); break; + case RSC_CURRENCYBOX: aHID.append( "CurrencyBox" ); break; + case RSC_DATEBOX: aHID.append( "DateBox" ); break; + case RSC_TIMEBOX: aHID.append( "TimeBox" ); break; + case RSC_IMAGEBUTTON: aHID.append( "ImageButton" ); break; + case RSC_MENUBUTTON: aHID.append( "MenuButton" ); break; + case RSC_MOREBUTTON: aHID.append( "MoreButton" ); break; default: - return 0; - } // of switch - nHID |= nLID; - } // of if - break; - default: - return 0; - } // of switch - nHID |= nGID << 14; + // no type, no auto HID + return rtl::OString(); + } + break; + default: + return rtl::OString(); + } + } + + // append resource id hierarchy + for( int nOff = nCurStack-1; nOff >= 0; nOff-- ) + { + aHID.append( '.' ); + pRC = StackTop( nOff ); + + OSL_ENSURE( pRC->pResource, "missing resource in resource stack level !" ); + if( pRC->pResource ) + aHID.append( sal_Int32( pRC->pResource->GetId() ) ); + } - return nHID; + return aHID.makeStringAndClear(); } // ----------------------------------------------------------------------- diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.src b/ucbhelper/workben/ucbexplorer/ucbexplorer.src index 4bee5900eaaf..523813324710 100644 --- a/ucbhelper/workben/ucbexplorer/ucbexplorer.src +++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.src @@ -100,6 +100,7 @@ Bitmap BMP_LINK ModalDialog DLG_STRINGINPUT { + HelpID = "ucbhelper:ModalDialog:DLG_STRINGINPUT"; Border = TRUE ; Moveable = TRUE ; OutputSize = TRUE ; @@ -113,6 +114,7 @@ ModalDialog DLG_STRINGINPUT }; Edit ED_STRINGINPUT_DLG_NAME { + HelpID = "ucbhelper:Edit:DLG_STRINGINPUT:ED_STRINGINPUT_DLG_NAME"; Pos = MAP_APPFONT ( 40 , 16 ) ; Size = MAP_APPFONT ( 110 , 12 ) ; Border = TRUE ; diff --git a/unotools/inc/unotools/lingucfg.hxx b/unotools/inc/unotools/lingucfg.hxx index 9a26bdd73021..9a26bdd73021 100755..100644 --- a/unotools/inc/unotools/lingucfg.hxx +++ b/unotools/inc/unotools/lingucfg.hxx diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 39233f022534..39233f022534 100755..100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx diff --git a/vcl/inc/vcl/btndlg.hxx b/vcl/inc/vcl/btndlg.hxx index dbeb8350a0d4..3186ba5f6399 100644 --- a/vcl/inc/vcl/btndlg.hxx +++ b/vcl/inc/vcl/btndlg.hxx @@ -104,8 +104,8 @@ public: XubString GetButtonText( USHORT nId ) const; void SetButtonHelpText( USHORT nId, const XubString& rText ); XubString GetButtonHelpText( USHORT nId ) const; - void SetButtonHelpId( USHORT nId, ULONG nHelpId ); - ULONG GetButtonHelpId( USHORT nId ) const; + void SetButtonHelpId( USHORT nId, const rtl::OString& rHelpId ); + rtl::OString GetButtonHelpId( USHORT nId ) const; void SetFocusButton( USHORT nId = BUTTONDIALOG_BUTTON_NOTFOUND ) { mnFocusButtonId = nId; } USHORT GetFocusButton() const { return mnFocusButtonId; } diff --git a/vcl/inc/vcl/help.hxx b/vcl/inc/vcl/help.hxx index 30308aa8a723..1f4ba36d8f43 100644 --- a/vcl/inc/vcl/help.hxx +++ b/vcl/inc/vcl/help.hxx @@ -52,8 +52,8 @@ class Window; #define QUICKHELP_BIDI_RTL ((USHORT)0x8000) // By changes you must also change: rsc/vclrsc.hxx -#define OOO_HELP_INDEX ((ULONG)0xFFFFFFFF) -#define OOO_HELP_HELPONHELP ((ULONG)0xFFFFFFFE) +#define OOO_HELP_INDEX ".help:index" +#define OOO_HELP_HELPONHELP ".help:helponhelp" // -------- // - Help - @@ -71,10 +71,9 @@ public: void SetHelpFile( const String& rFileName ) { maHelpFile = rFileName; } const String& GetHelpFile() const { return maHelpFile; } - virtual BOOL Start( ULONG nHelpId, const Window* pWindow ); - virtual BOOL Start( const XubString& rKeyWord, const Window* pWindow ); - virtual void OpenHelpAgent( ULONG nHelpId ); - virtual XubString GetHelpText( ULONG nHelpId, const Window* pWindow ); + virtual BOOL Start( const XubString& rHelpId, const Window* pWindow ); + virtual BOOL SearchKeyword( const XubString& rKeyWord ); + virtual void OpenHelpAgent( const rtl::OString& rHelpId ); virtual XubString GetHelpText( const String& aHelpURL, const Window* pWindow ); static void EnableContextHelp(); diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx index 908f3e30319c..d57fdeb7cfd3 100644 --- a/vcl/inc/vcl/menu.hxx +++ b/vcl/inc/vcl/menu.hxx @@ -304,8 +304,8 @@ public: void SetHelpCommand( USHORT nItemId, const XubString& rString ); const XubString& GetHelpCommand( USHORT nItemId ) const; - void SetHelpId( USHORT nItemId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nItemId ) const; + void SetHelpId( USHORT nItemId, const rtl::OString& rHelpId ); + rtl::OString GetHelpId( USHORT nItemId ) const; void SetActivateHdl( const Link& rLink ) { aActivateHdl = rLink; } const Link& GetActivateHdl() const { return aActivateHdl; } diff --git a/vcl/inc/vcl/smartid.hxx b/vcl/inc/vcl/smartid.hxx deleted file mode 100755 index 2cc5f347b2cb..000000000000 --- a/vcl/inc/vcl/smartid.hxx +++ /dev/null @@ -1,87 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SMARTID_HXX_ -#define _SMARTID_HXX_ - -#include <tools/string.hxx> -#include <vcl/dllapi.h> - -/// SMART_SET_SMART only sets the Ids that are defined in the SmartId -/// the other types set whatever is given. This can also be used to reset an Id -enum SmartIdUpdateMode { SMART_SET_SMART, SMART_SET_NUM, SMART_SET_STR, SMART_SET_ALL }; - -struct ImplSmartIdData; - -/* - -SmartId is a substitute for Numeric HelpIds. They can handle Numeric and String HelpIds and offer commonly needed operators. - -Matching Ids: -if part of an Id is not set (HasNumeric HasString is False) then this part will never match to anything. Not even unset values - -*/ -class VCL_DLLPUBLIC SmartId -{ -private: - ImplSmartIdData* mpData; - SAL_DLLPRIVATE ImplSmartIdData* GetSmartIdData(); - -public: - explicit SmartId( const String& rId ); - explicit SmartId( ULONG nId ); - SmartId( const String& rId, ULONG nId ); - - SmartId(); - - SmartId( const SmartId& rId ); - SmartId& operator = ( const SmartId& rId ); - - ~SmartId(); - - void UpdateId( const SmartId& rId, SmartIdUpdateMode aMode = SMART_SET_SMART ); - - BOOL HasNumeric() const; - BOOL HasString() const; - BOOL HasAny() const; - ULONG GetNum() const; - String GetStr() const; - - String GetText() const; /// return String for UI usage - - BOOL Matches( const String &rId )const; - BOOL Matches( const ULONG nId ) const; -/// In case both Ids have both values set only the StringId is used for Matching - BOOL Matches( const SmartId &rId ) const; - - BOOL Equals( const SmartId &rId ) const; - - BOOL operator == ( const SmartId& rRight ) const; - BOOL operator < ( const SmartId& rRight ) const; -}; - -#endif diff --git a/vcl/inc/vcl/status.hxx b/vcl/inc/vcl/status.hxx index 810ecf230960..907d08272cbb 100644 --- a/vcl/inc/vcl/status.hxx +++ b/vcl/inc/vcl/status.hxx @@ -183,8 +183,8 @@ public: using Window::GetQuickHelpText; const XubString& GetQuickHelpText( USHORT nItemId ) const; - void SetHelpId( USHORT nItemId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nItemId ) const; + void SetHelpId( USHORT nItemId, const rtl::OString& rHelpId ); + rtl::OString GetHelpId( USHORT nItemId ) const; void SetBottomBorder( BOOL bBottomBorder = TRUE ); BOOL IsBottomBorder() const { return mbBottomBorder; } @@ -205,9 +205,9 @@ public: const XubString& GetHelpText() const { return Window::GetHelpText(); } - void SetHelpId( ULONG nId ) - { Window::SetHelpId( nId ); } - ULONG GetHelpId() const + void SetHelpId( const rtl::OString& rId ) + { Window::SetHelpId( rId ); } + const rtl::OString& GetHelpId() const { return Window::GetHelpId(); } Size CalcWindowSizePixel() const; diff --git a/vcl/inc/vcl/svdata.hxx b/vcl/inc/vcl/svdata.hxx index 0d54a82a1937..3e0ba5a44845 100644 --- a/vcl/inc/vcl/svdata.hxx +++ b/vcl/inc/vcl/svdata.hxx @@ -318,8 +318,7 @@ struct ImplSVNWFData // checkbox bool mbScrollbarJumpPage; // true for "jump to here" behavior int mnStatusBarLowerRightOffset; // amount in pixel to avoid in the lower righthand corner - // used on the Mac where the system resizer paints over - // our window content + bool mbCanDrawWidgetAnySize; // set to true currently on gtk }; diff --git a/vcl/inc/vcl/tabctrl.hxx b/vcl/inc/vcl/tabctrl.hxx index 4c63b12f15fe..ad702ac4dc54 100644 --- a/vcl/inc/vcl/tabctrl.hxx +++ b/vcl/inc/vcl/tabctrl.hxx @@ -70,7 +70,6 @@ private: BOOL mbRestoreUnqId; BOOL mbSingleLine; BOOL mbScroll; - BOOL mbRestoreSmartId; BOOL mbSmallInvalidate; BOOL mbExtraSpace; Link maActivateHdl; @@ -177,8 +176,8 @@ public: void SetHelpText( USHORT nPageId, const XubString& rText ); const XubString& GetHelpText( USHORT nPageId ) const; - void SetHelpId( USHORT nPageId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nPageId ) const; + void SetHelpId( USHORT nPageId, const rtl::OString& rHelpId ); + rtl::OString GetHelpId( USHORT nPageId ) const; void SetPageImage( USHORT nPageId, const Image& rImage ); const Image* GetPageImage( USHORT nPageId ) const; @@ -188,9 +187,9 @@ public: const XubString& GetHelpText() const { return Control::GetHelpText(); } - void SetHelpId( ULONG nId ) - { Control::SetHelpId( nId ); } - ULONG GetHelpId() const + void SetHelpId( const rtl::OString& rId ) + { Control::SetHelpId( rId ); } + const rtl::OString& GetHelpId() const { return Control::GetHelpId(); } void SetActivatePageHdl( const Link& rLink ) { maActivateHdl = rLink; } diff --git a/vcl/inc/vcl/toolbox.h b/vcl/inc/vcl/toolbox.h index 33e4e8d2e013..7cdeb0b17a5a 100644 --- a/vcl/inc/vcl/toolbox.h +++ b/vcl/inc/vcl/toolbox.h @@ -68,7 +68,7 @@ struct ImplToolItem XubString maQuickHelpText; XubString maHelpText; String maCommandStr; - ULONG mnHelpId; + rtl::OString maHelpId; Rectangle maRect; Rectangle maCalcRect; // the overall horizontal item size, including one or more of [image size + textlength + dropdown arrow] diff --git a/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx index 5cc102842dc3..aa7ddd886bbb 100644 --- a/vcl/inc/vcl/toolbox.hxx +++ b/vcl/inc/vcl/toolbox.hxx @@ -511,8 +511,8 @@ public: void SetHelpText( USHORT nItemId, const XubString& rText ); const XubString& GetHelpText( USHORT nItemId ) const; - void SetHelpId( USHORT nItemId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nItemId ) const; + void SetHelpId( USHORT nItemId, const rtl::OString& rHelpId ); + rtl::OString GetHelpId( USHORT nItemId ) const; // window size according to current alignment, floating state and number of lines Size CalcWindowSizePixel() const; @@ -569,9 +569,9 @@ public: const XubString& GetHelpText() const { return DockingWindow::GetHelpText(); } - void SetHelpId( ULONG nId ) - { DockingWindow::SetHelpId( nId ); } - ULONG GetHelpId() const + void SetHelpId( const rtl::OString& rId ) + { DockingWindow::SetHelpId( rId ); } + const rtl::OString& GetHelpId() const { return DockingWindow::GetHelpId(); } void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } diff --git a/vcl/inc/vcl/window.h b/vcl/inc/vcl/window.h index 691c3ed18421..ff76874de11a 100644 --- a/vcl/inc/vcl/window.h +++ b/vcl/inc/vcl/window.h @@ -56,7 +56,7 @@ class VirtualDevice; class Cursor; class ImplDevFontList; class ImplFontCache; -class SmartId; +class SalControlHandle; class VCLXWindow; class SalFrame; class SalObject; @@ -120,8 +120,6 @@ struct ImplWinData USHORT mnIsTopWindow; BOOL mbMouseOver; // tracks mouse over for native widget paint effect BOOL mbEnableNativeWidget; // toggle native widget rendering - SmartId* mpSmartHelpId; - SmartId* mpSmartUniqueId; ::std::list< Window* > maTopWindowChildren; }; @@ -254,8 +252,8 @@ public: long mnY; long mnAbsScreenX; Point maPos; - ULONG mnHelpId; - ULONG mnUniqId; + rtl::OString maHelpId; + rtl::OString maUniqId; XubString maHelpText; XubString maQuickHelpText; InputContext maInputContext; diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index 8264767e59ad..7c72f40d2767 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -50,7 +50,6 @@ #include <rtl/ustring.hxx> #include <cppuhelper/weakref.hxx> #include <com/sun/star/uno/Reference.hxx> -#include <vcl/smartid.hxx> class VirtualDevice; struct ImplDelData; @@ -953,16 +952,12 @@ public: void SetQuickHelpText( const XubString& rHelpText ); const XubString& GetQuickHelpText() const; - void SetHelpId( ULONG nHelpId ); /// deprecated - ULONG GetHelpId() const; /// deprecated - void SetSmartHelpId( const SmartId& aId, SmartIdUpdateMode aMode = SMART_SET_SMART ); - SmartId GetSmartHelpId() const; + void SetHelpId( const rtl::OString& ); + const rtl::OString& GetHelpId() const; - void SetUniqueId( ULONG nUniqueId ); /// deprecated - ULONG GetUniqueId() const; /// deprecated - void SetSmartUniqueId( const SmartId& aId, SmartIdUpdateMode aMode = SMART_SET_SMART ); - SmartId GetSmartUniqueId() const; - SmartId GetSmartUniqueOrHelpId() const; + void SetUniqueId( const rtl::OString& ); + const rtl::OString& GetUniqueId() const; + const rtl::OString& GetUniqueOrHelpId() const; Window* FindWindow( const Point& rPos ) const; diff --git a/vcl/prj/d.lst b/vcl/prj/d.lst index 441bf2e265d5..e28dc755e8a8 100644 --- a/vcl/prj/d.lst +++ b/vcl/prj/d.lst @@ -144,7 +144,6 @@ mkdir: %_DEST%\inc%_EXT%\vcl ..\inc\vcl\pdfextoutdevdata.hxx %_DEST%\inc%_EXT%\vcl\pdfextoutdevdata.hxx ..\inc\vcl\pngread.hxx %_DEST%\inc%_EXT%\vcl\pngread.hxx ..\inc\vcl\pngwrite.hxx %_DEST%\inc%_EXT%\vcl\pngwrite.hxx -..\inc\vcl\smartid.hxx %_DEST%\inc%_EXT%\vcl\smartid.hxx ..\inc\vcl\configsettings.hxx %_DEST%\inc%_EXT%\vcl\configsettings.hxx ..\inc\vcl\ImageListProvider.hxx %_DEST%\inc%_EXT%\vcl\ImageListProvider.hxx ..\inc\vcl\fontmanager.hxx %_DEST%\inc%_EXT%\vcl\fontmanager.hxx diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 1f9efa7b6e65..2c7ad2fa9c3e 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -62,12 +62,7 @@ Help::~Help() // ----------------------------------------------------------------------- -BOOL Help::Start( ULONG, const Window* ) -{ - return FALSE; -} - -void Help::OpenHelpAgent( ULONG ) +void Help::OpenHelpAgent( const rtl::OString& ) { } @@ -78,11 +73,9 @@ BOOL Help::Start( const XubString&, const Window* ) return FALSE; } -// ----------------------------------------------------------------------- - -XubString Help::GetHelpText( ULONG, const Window* ) +BOOL Help::SearchKeyword( const XubString& ) { - return ImplGetSVEmptyStr(); + return FALSE; } // ----------------------------------------------------------------------- diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index b91afbbae9fe..b91afbbae9fe 100755..100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index f8b0d1d3379f..f1065c07ca24 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -112,7 +112,6 @@ void ImplInitSVData() // init global instance data memset( pImplSVData, 0, sizeof( ImplSVData ) ); pImplSVData->maHelpData.mbAutoHelpId = sal_True; - pImplSVData->maHelpData.mbAutoHelpId = sal_True; pImplSVData->maNWFData.maMenuBarHighlightTextColor = Color( COL_TRANSPARENT ); // find out whether we are running in the testtool diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 754270e9012f..c51ac834f1b4 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -114,8 +114,9 @@ BOOL ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbuttonVa Size aSize( pBorder->GetOutputSizePixel() ); // the size of the border window, i.e., the whole control Rectangle aBound, aContent; Rectangle aNatRgn( aPt, aSize ); - if( pBorder->GetNativeControlRegion(CTRL_SPINBOX, PART_ENTIRE_CONTROL, - aNatRgn, 0, rSpinbuttonValue, rtl::OUString(), aBound, aContent) ) + if( ! ImplGetSVData()->maNWFData.mbCanDrawWidgetAnySize && + pBorder->GetNativeControlRegion( CTRL_SPINBOX, PART_ENTIRE_CONTROL, + aNatRgn, 0, rSpinbuttonValue, rtl::OUString(), aBound, aContent) ) { aSize = aContent.GetSize(); } diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index c892b32534ec..e9696aa8c492 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -42,7 +42,6 @@ #include "vcl/controldata.hxx" #include "vcl/sound.hxx" #include "vcl/lstbox.hxx" -#include "vcl/smartid.hxx" #include "vcl/window.h" @@ -59,7 +58,7 @@ struct ImplTabItem String maText; String maFormatText; String maHelpText; - ULONG mnHelpId; + rtl::OString maHelpId; Rectangle maRect; USHORT mnLine; bool mbFullVisible; @@ -67,7 +66,7 @@ struct ImplTabItem Image maTabImage; ImplTabItem() - : mnId( 0 ), mnTabPageResId( 0 ), mpTabPage( NULL ), mnHelpId( 0 ), + : mnId( 0 ), mnTabPageResId( 0 ), mpTabPage( NULL ), mnLine( 0 ), mbFullVisible( FALSE ), mbEnabled( true ) {} }; @@ -151,7 +150,6 @@ void TabControl::ImplInit( Window* pParent, WinBits nStyle ) mbRestoreUnqId = FALSE; mbSingleLine = FALSE; mbScroll = FALSE; - mbRestoreSmartId = FALSE; mbSmallInvalidate = FALSE; mbExtraSpace = FALSE; mpTabCtrlData = new ImplTabCtrlData; @@ -705,11 +703,9 @@ void TabControl::ImplChangeTabPage( USHORT nId, USHORT nOldId ) if ( pOldPage ) { if ( mbRestoreHelpId ) - pCtrlParent->SetHelpId( 0 ); + pCtrlParent->SetHelpId( rtl::OString() ); if ( mbRestoreUnqId ) - pCtrlParent->SetUniqueId( 0 ); - if( mbRestoreSmartId ) - pCtrlParent->SetSmartHelpId( SmartId() ); + pCtrlParent->SetUniqueId( rtl::OString() ); pOldPage->DeactivatePage(); } @@ -719,21 +715,16 @@ void TabControl::ImplChangeTabPage( USHORT nId, USHORT nOldId ) // activate page here so the conbtrols can be switched // also set the help id of the parent window to that of the tab page - if ( !GetHelpId() ) + if ( !GetHelpId().getLength() ) { mbRestoreHelpId = TRUE; pCtrlParent->SetHelpId( pPage->GetHelpId() ); } - if ( !pCtrlParent->GetUniqueId() ) + if ( !pCtrlParent->GetUniqueId().getLength() ) { mbRestoreUnqId = TRUE; pCtrlParent->SetUniqueId( pPage->GetUniqueId() ); } - if( ! GetSmartHelpId().HasAny() ) - { - mbRestoreSmartId = TRUE; - pCtrlParent->SetSmartHelpId( pPage->GetSmartHelpId() ); - } pPage->ActivatePage(); @@ -1486,13 +1477,13 @@ void TabControl::RequestHelp( const HelpEvent& rHEvt ) } else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { - ULONG nHelpId = GetHelpId( nItemId ); - if ( nHelpId ) + rtl::OUString aHelpId( rtl::OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) ); + if ( aHelpId.getLength() ) { // Wenn eine Hilfe existiert, dann ausloesen Help* pHelp = Application::GetHelp(); if ( pHelp ) - pHelp->Start( nHelpId, this ); + pHelp->Start( aHelpId, this ); return; } } @@ -1574,7 +1565,7 @@ void TabControl::Command( const CommandEvent& rCEvt ) aMenu.InsertItem( it->mnId, it->maText, MIB_CHECKABLE | MIB_RADIOCHECK ); if ( it->mnId == mnCurPageId ) aMenu.CheckItem( it->mnId ); - aMenu.SetHelpId( it->mnId, it->mnHelpId ); + aMenu.SetHelpId( it->mnId, it->maHelpId ); } USHORT nId = aMenu.Execute( this, aMenuPos ); @@ -1826,7 +1817,6 @@ void TabControl::InsertPage( USHORT nPageId, const XubString& rText, pItem->mnId = nPageId; pItem->mpTabPage = NULL; pItem->mnTabPageResId = 0; - pItem->mnHelpId = 0; pItem->maText = rText; pItem->mbFullVisible = FALSE; @@ -2154,11 +2144,11 @@ const XubString& TabControl::GetHelpText( USHORT nPageId ) const if ( pItem ) { - if ( !pItem->maHelpText.Len() && pItem->mnHelpId ) + if ( !pItem->maHelpText.Len() && pItem->maHelpId.getLength() ) { Help* pHelp = Application::GetHelp(); if ( pHelp ) - pItem->maHelpText = pHelp->GetHelpText( pItem->mnHelpId, this ); + pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); } return pItem->maHelpText; @@ -2169,24 +2159,25 @@ const XubString& TabControl::GetHelpText( USHORT nPageId ) const // ----------------------------------------------------------------------- -void TabControl::SetHelpId( USHORT nPageId, ULONG nHelpId ) +void TabControl::SetHelpId( USHORT nPageId, const rtl::OString& rHelpId ) { ImplTabItem* pItem = ImplGetItem( nPageId ); if ( pItem ) - pItem->mnHelpId = nHelpId; + pItem->maHelpId = rHelpId; } // ----------------------------------------------------------------------- -ULONG TabControl::GetHelpId( USHORT nPageId ) const +rtl::OString TabControl::GetHelpId( USHORT nPageId ) const { + rtl::OString aRet; ImplTabItem* pItem = ImplGetItem( nPageId ); if ( pItem ) - return pItem->mnHelpId; - else - return 0; + aRet = pItem->maHelpId; + + return aRet; } // ----------------------------------------------------------------------- diff --git a/vcl/source/helper/makefile.mk b/vcl/source/helper/makefile.mk index e708bdec9eaa..1a417417dbe4 100644 --- a/vcl/source/helper/makefile.mk +++ b/vcl/source/helper/makefile.mk @@ -46,7 +46,6 @@ SLOFILES=\ $(SLO)$/canvastools.obj \ $(SLO)$/xconnection.obj \ $(SLO)$/threadex.obj \ - $(SLO)$/smartid.obj \ $(SLO)$/lazydelete.obj # --- Targets ------------------------------------------------------ diff --git a/vcl/source/helper/smartid.cxx b/vcl/source/helper/smartid.cxx deleted file mode 100755 index c367aeb2bce5..000000000000 --- a/vcl/source/helper/smartid.cxx +++ /dev/null @@ -1,264 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_vcl.hxx" -#include <vcl/smartid.hxx> - -struct ImplSmartIdData -{ - String aUId; - ULONG nUId; - BOOL bHasStringId; - BOOL bHasNumericId; -}; - - -ImplSmartIdData* SmartId::GetSmartIdData() -{ - if ( !mpData ) - { - mpData = new ImplSmartIdData; -// mpData->aUId = ""; - mpData->nUId = 0; - mpData->bHasStringId = FALSE; - mpData->bHasNumericId = FALSE; - } - return mpData; -} - - -SmartId::SmartId( const String& rId ) -: mpData( NULL ) -{ - GetSmartIdData()->aUId = rId; - GetSmartIdData()->bHasStringId = TRUE; -} - -SmartId::SmartId( ULONG nId ) -: mpData( NULL ) -{ - GetSmartIdData()->nUId = nId; - GetSmartIdData()->bHasNumericId = TRUE; -} - -SmartId::SmartId( const String& rId, ULONG nId ) -: mpData( NULL ) -{ - GetSmartIdData()->aUId = rId; - GetSmartIdData()->bHasStringId = TRUE; - GetSmartIdData()->nUId = nId; - GetSmartIdData()->bHasNumericId = TRUE; -} - -SmartId::SmartId() -: mpData( NULL ) -{} - -SmartId::SmartId( const SmartId& rId ) -: mpData( NULL ) -{ - if ( rId.mpData ) - { - GetSmartIdData(); - mpData->aUId = rId.mpData->aUId; - mpData->bHasStringId = rId.mpData->bHasStringId; - mpData->nUId = rId.mpData->nUId; - mpData->bHasNumericId = rId.mpData->bHasNumericId; - } -} - -SmartId& SmartId::operator = ( const SmartId& rId ) -{ - if ( rId.mpData ) - GetSmartIdData(); - else - { - delete mpData; - mpData = NULL; - } - if ( mpData && rId.mpData ) - { - mpData->aUId = rId.mpData->aUId; - mpData->bHasStringId = rId.mpData->bHasStringId; - mpData->nUId = rId.mpData->nUId; - mpData->bHasNumericId = rId.mpData->bHasNumericId; - } - return *this; -} - -SmartId::~SmartId() -{ - if ( mpData ) - delete mpData; -#ifdef DBG_UTIL - if ( mpData ) - mpData = (ImplSmartIdData*)0xDeadBeef; -#endif -} - -void SmartId::UpdateId( const SmartId& rId, SmartIdUpdateMode aMode ) -{ - // Check if ImplData is needed - if ( aMode != SMART_SET_SMART || ( rId.HasString() || rId.HasNumeric() ) ) - GetSmartIdData(); - - if ( aMode == SMART_SET_STR || aMode == SMART_SET_ALL || ( aMode == SMART_SET_SMART && rId.HasString() ) ) - { - GetSmartIdData()->aUId = rId.GetStr(); - GetSmartIdData()->bHasStringId = rId.HasString(); - } - if ( aMode == SMART_SET_NUM || aMode == SMART_SET_ALL || ( aMode == SMART_SET_SMART && rId.HasNumeric() ) ) - { - GetSmartIdData()->nUId = rId.GetNum(); - GetSmartIdData()->bHasNumericId = rId.HasNumeric(); - } - - // remove ImplData when no IDs are set. This is Important because Implementation of Equals() Matches and HasAny relies on it - if ( mpData && !mpData->bHasStringId && !mpData->bHasNumericId ) - { - delete mpData; - mpData = NULL; - } -} - -BOOL SmartId::HasNumeric() const -{ - if ( !mpData ) - return FALSE; - else - return mpData->bHasNumericId; -} - -BOOL SmartId::HasString() const -{ - if ( !mpData ) - return FALSE; - else - return mpData->bHasStringId; -} - -BOOL SmartId::HasAny() const -{ - return mpData != NULL; -} - -ULONG SmartId::GetNum() const -{ - if ( !mpData ) - return 0; - else - return mpData->nUId; -} - -String SmartId::GetStr() const -{ - if ( !mpData ) - return String(); - else - return mpData->aUId; -} - - -String SmartId::GetText() const // return String for UI usage -{ - String aRes; - if ( HasNumeric() ) - aRes = String::CreateFromInt64( GetNum() ); - if ( HasString() ) - { - if ( HasNumeric() ) - aRes.AppendAscii( "/" ); - aRes.Append( GetStr() ); - } - return aRes; -} - -BOOL SmartId::Matches( const String &rId )const -{ - if ( HasString() ) - return GetStr().EqualsIgnoreCaseAscii( rId ); - else - return FALSE; -} - -BOOL SmartId::Matches( const ULONG nId ) const -{ - if ( HasNumeric() ) - return GetNum() == nId; - else - return FALSE; -} - -/****************************************************************************** -If Both Ids have nither Strings nor Numbers they don't match -If both Ids have Strings the result of Matching these is returned. -Numbers are then Ignored. -Else Matching Numbers is attempted. -******************************************************************************/ -BOOL SmartId::Matches( const SmartId &rId ) const -{ - if ( !mpData || !rId.mpData ) - return FALSE; - else if ( HasString() && rId.HasString() ) - return Matches( rId.GetStr() ); - else - return rId.HasNumeric() && Matches( rId.GetNum() ); -} - -BOOL SmartId::Equals( const SmartId &rId ) const -{ - if ( mpData && rId.mpData ) - return mpData->aUId.EqualsIgnoreCaseAscii( rId.mpData->aUId ) - && mpData->bHasStringId == rId.mpData->bHasStringId - && mpData->nUId == rId.mpData->nUId - && mpData->bHasNumericId == rId.mpData->bHasNumericId; - else if ( !mpData && !rId.mpData ) - return TRUE; - else - return FALSE; -} - -BOOL SmartId::operator == ( const SmartId& rRight ) const -{ - return Equals( rRight ); -} - -BOOL SmartId::operator < ( const SmartId& rRight ) const -{ - if ( HasString() && rRight.HasString() && GetStr() != rRight.GetStr() ) - return GetStr() < rRight.GetStr(); - else if ( HasNumeric() && rRight.HasNumeric() && GetNum() != rRight.GetNum() ) - return GetNum() < rRight.GetNum(); - else - { // Sort Strings to Front - if ( HasString() ) - return rRight.HasString() && rRight.HasNumeric(); - else - return rRight.HasString() || (!HasNumeric() && rRight.HasNumeric()); - } -} diff --git a/vcl/source/src/print.src b/vcl/source/src/print.src index 010cae338e0e..13ae6b0ead76 100644 --- a/vcl/source/src/print.src +++ b/vcl/source/src/print.src @@ -29,6 +29,7 @@ ModalDialog SV_DLG_PRINT { + HelpID = "vcl:ModalDialog:SV_DLG_PRINT"; Text [en-US] = "Print"; Closeable = TRUE; Sizeable = TRUE; @@ -64,6 +65,7 @@ ModalDialog SV_DLG_PRINT }; NumericField SV_PRINT_PAGE_EDIT { + HelpID = "vcl:NumericField:SV_DLG_PRINT:SV_PRINT_PAGE_EDIT"; Pos = MAP_APPFONT( 5, 140 ); Size = MAP_APPFONT( 30, 12 ); SVLook = TRUE; @@ -80,18 +82,21 @@ ModalDialog SV_DLG_PRINT }; PushButton SV_PRINT_PAGE_FORWARD { + HelpID = "vcl:PushButton:SV_DLG_PRINT:SV_PRINT_PAGE_FORWARD"; Pos = MAP_APPFONT( 95, 140 ); Size = MAP_APPFONT( 15, 12 ); HelpText [en-US] = "Scroll one page forward."; }; PushButton SV_PRINT_PAGE_BACKWARD { + HelpID = "vcl:PushButton:SV_DLG_PRINT:SV_PRINT_PAGE_BACKWARD"; Pos = MAP_APPFONT( 80, 140 ); Size = MAP_APPFONT( 15, 12 ); HelpText [en-US] = "Scroll one page backward."; }; TabControl SV_PRINT_TABCTRL { + HelpID = "vcl:TabControl:SV_DLG_PRINT:SV_PRINT_TABCTRL"; Pos = MAP_APPFONT( 140, 5 ); Size = MAP_APPFONT( 205, 175 ); }; @@ -123,6 +128,7 @@ ModalDialog SV_DLG_PRINT TabPage SV_PRINT_TAB_NUP { + HelpID = "vcl:TabPage:SV_PRINT_TAB_NUP"; Text [en-US] = "Page Layout"; Hide = TRUE; @@ -134,6 +140,7 @@ ModalDialog SV_DLG_PRINT }; RadioButton SV_PRINT_PRT_NUP_DEFAULT_BTN { + HelpID = "vcl:RadioButton:SV_PRINT_TAB_NUP:SV_PRINT_PRT_NUP_DEFAULT_BTN"; Pos = MAP_APPFONT( 0, 0 ); Size = MAP_APPFONT( 10, 10 ); Text [en-US] = "~Default"; @@ -141,12 +148,14 @@ ModalDialog SV_DLG_PRINT }; RadioButton SV_PRINT_PRT_NUP_BROCHURE_BTN { + HelpID = "vcl:RadioButton:SV_PRINT_TAB_NUP:SV_PRINT_PRT_NUP_BROCHURE_BTN"; Pos = MAP_APPFONT( 0, 0 ); Size = MAP_APPFONT( 10, 10 ); Text = ""; }; RadioButton SV_PRINT_PRT_NUP_PAGES_BTN { + HelpID = "vcl:RadioButton:SV_PRINT_TAB_NUP:SV_PRINT_PRT_NUP_PAGES_BTN"; Pos = MAP_APPFONT( 0, 0 ); Size = MAP_APPFONT( 10, 10 ); Text [en-US] = "Pa~ges per sheet"; @@ -154,6 +163,7 @@ ModalDialog SV_DLG_PRINT }; ListBox SV_PRINT_PRT_NUP_PAGES_BOX { + HelpID = "vcl:ListBox:SV_PRINT_TAB_NUP:SV_PRINT_PRT_NUP_PAGES_BOX"; Pos = MAP_APPFONT( 0, 0 ); Size = MAP_APPFONT( 10, 80 ); Border = TRUE; @@ -180,6 +190,7 @@ ModalDialog SV_DLG_PRINT }; NumericField SV_PRINT_PRT_NUP_COLS_EDT { + HelpID = "vcl:NumericField:SV_PRINT_TAB_NUP:SV_PRINT_PRT_NUP_COLS_EDT"; Pos = MAP_APPFONT( 55, 20 ); Size = MAP_APPFONT( 40, 12 ); Border = TRUE; @@ -198,6 +209,7 @@ ModalDialog SV_DLG_PRINT }; NumericField SV_PRINT_PRT_NUP_ROWS_EDT { + HelpID = "vcl:NumericField:SV_PRINT_TAB_NUP:SV_PRINT_PRT_NUP_ROWS_EDT"; Pos = MAP_APPFONT( 55, 35 ); Size = MAP_APPFONT( 40, 12 ); Border = TRUE; @@ -215,6 +227,7 @@ ModalDialog SV_DLG_PRINT }; MetricField SV_PRINT_PRT_NUP_MARGINS_PAGES_EDT { + HelpID = "vcl:MetricField:SV_PRINT_TAB_NUP:SV_PRINT_PRT_NUP_MARGINS_PAGES_EDT"; Pos = MAP_APPFONT( 55, 95 ); Size = MAP_APPFONT( 40, 12 ); Spin = TRUE; @@ -237,6 +250,7 @@ ModalDialog SV_DLG_PRINT }; MetricField SV_PRINT_PRT_NUP_MARGINS_SHEET_EDT { + HelpID = "vcl:MetricField:SV_PRINT_TAB_NUP:SV_PRINT_PRT_NUP_MARGINS_SHEET_EDT"; Pos = MAP_APPFONT( 155, 95 ); Size = MAP_APPFONT( 40, 12 ); Spin = TRUE; @@ -259,6 +273,7 @@ ModalDialog SV_DLG_PRINT }; ListBox SV_PRINT_PRT_NUP_ORIENTATION_BOX { + HelpID = "vcl:ListBox:SV_PRINT_TAB_NUP:SV_PRINT_PRT_NUP_ORIENTATION_BOX"; Pos = MAP_APPFONT( 0, 0 ); Size = MAP_APPFONT( 10, 40 ); Border = TRUE; @@ -280,6 +295,7 @@ ModalDialog SV_DLG_PRINT }; ListBox SV_PRINT_PRT_NUP_ORDER_BOX { + HelpID = "vcl:ListBox:SV_PRINT_TAB_NUP:SV_PRINT_PRT_NUP_ORDER_BOX"; Pos = MAP_APPFONT( 0, 0 ); Size = MAP_APPFONT( 10, 20 ); DropDown = TRUE; @@ -294,6 +310,7 @@ ModalDialog SV_DLG_PRINT }; CheckBox SV_PRINT_PRT_NUP_BORDER_CB { + HelpID = "vcl:CheckBox:SV_PRINT_TAB_NUP:SV_PRINT_PRT_NUP_BORDER_CB"; Pos = MAP_APPFONT( 10, 65 ); Size = MAP_APPFONT( 150, 12 ); Text [en-US] = "Draw a border around each page"; @@ -303,6 +320,7 @@ ModalDialog SV_DLG_PRINT TabPage SV_PRINT_TAB_JOB { + HelpID = "vcl:TabPage:SV_PRINT_TAB_JOB"; Text [en-US] = "General"; Hide = TRUE; @@ -314,6 +332,7 @@ ModalDialog SV_DLG_PRINT }; ListBox SV_PRINT_PRINTERS { + HelpID = "vcl:ListBox:SV_PRINT_TAB_JOB:SV_PRINT_PRINTERS"; Pos = MAP_APPFONT( 5, 5 ); Size = MAP_APPFONT( 100, 80 ); Border = TRUE; @@ -322,6 +341,7 @@ ModalDialog SV_DLG_PRINT }; CheckBox SV_PRINT_DETAILS_BTN { + HelpID = "vcl:CheckBox:SV_PRINT_TAB_JOB:SV_PRINT_DETAILS_BTN"; Pos = MAP_APPFONT( 5, 5 ); Size = MAP_APPFONT( 5, 5 ); Text [en-US] = "Details"; @@ -347,6 +367,7 @@ ModalDialog SV_DLG_PRINT }; PushButton SV_PRINT_PRT_SETUP { + HelpID = "vcl:PushButton:SV_PRINT_TAB_JOB:SV_PRINT_PRT_SETUP"; Pos = MAP_APPFONT( 115, 5 ); Size = MAP_APPFONT( 50, 15 ); Text [en-US] = "Properties..."; @@ -366,6 +387,7 @@ ModalDialog SV_DLG_PRINT }; NumericField SV_PRINT_COPYCOUNT_FIELD { + HelpID = "vcl:NumericField:SV_PRINT_TAB_JOB:SV_PRINT_COPYCOUNT_FIELD"; Pos = MAP_APPFONT( 10, 56 ); Size = MAP_APPFONT( 40, 12 ); Border = TRUE; @@ -382,6 +404,7 @@ ModalDialog SV_DLG_PRINT }; CheckBox SV_PRINT_COLLATE { + HelpID = "vcl:CheckBox:SV_PRINT_TAB_JOB:SV_PRINT_COLLATE"; Pos = MAP_APPFONT( 95, 45 ); Size = MAP_APPFONT( 70, 10 ); Text [en-US] = "Collate"; @@ -411,6 +434,7 @@ ModalDialog SV_DLG_PRINT TabPage SV_PRINT_TAB_OPT { + HelpID = "vcl:TabPage:SV_PRINT_TAB_OPT"; Text [en-US] = "Options"; Hide = TRUE; @@ -422,6 +446,7 @@ ModalDialog SV_DLG_PRINT }; CheckBox SV_PRINT_OPT_TOFILE { + HelpID = "vcl:CheckBox:SV_PRINT_TAB_OPT:SV_PRINT_OPT_TOFILE"; Pos = MAP_APPFONT( 10, 20 ); Size = MAP_APPFONT( 200, 12 ); Text [en-US] = "Print to ~file"; @@ -429,6 +454,7 @@ ModalDialog SV_DLG_PRINT }; CheckBox SV_PRINT_OPT_SINGLEJOBS { + HelpID = "vcl:CheckBox:SV_PRINT_TAB_OPT:SV_PRINT_OPT_SINGLEJOBS"; Pos = MAP_APPFONT( 10, 35 ); Size = MAP_APPFONT( 200, 12 ); Text [en-US] = "~Create single print jobs for collated output"; @@ -436,6 +462,7 @@ ModalDialog SV_DLG_PRINT }; CheckBox SV_PRINT_OPT_REVERSE { + HelpID = "vcl:CheckBox:SV_PRINT_TAB_OPT:SV_PRINT_OPT_REVERSE"; Pos = MAP_APPFONT( 10, 50 ); Size = MAP_APPFONT( 200, 12 ); Text [en-US] = "Print in ~reverse page order"; @@ -446,6 +473,7 @@ ModalDialog SV_DLG_PRINT ModelessDialog SV_DLG_PRINT_PROGRESS { + HelpID = "vcl:ModelessDialog:SV_DLG_PRINT_PROGRESS"; Text [en-US] = "Printing"; Closeable = FALSE; Sizeable = FALSE; diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index b221d1f7d928..2ff7d0a687e7 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1348,8 +1348,10 @@ void ImplSmallBorderWindowView::DrawWindow( USHORT nDrawFlags, OutputDevice*, co Rectangle aBoundingRgn( aPoint, Size( mnWidth, mnHeight ) ); Rectangle aContentRgn( aCtrlRegion ); - if(pWin->GetNativeControlRegion( aCtrlType, aCtrlPart, aCtrlRegion, - nState, aControlValue, rtl::OUString(), aBoundingRgn, aContentRgn )) + if( ! ImplGetSVData()->maNWFData.mbCanDrawWidgetAnySize && + pWin->GetNativeControlRegion( aCtrlType, aCtrlPart, aCtrlRegion, + nState, aControlValue, rtl::OUString(), + aBoundingRgn, aContentRgn )) { aCtrlRegion=aContentRgn; } diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx index e835fe749ed1..9a0452027737 100644 --- a/vcl/source/window/btndlg.cxx +++ b/vcl/source/window/btndlg.cxx @@ -530,22 +530,19 @@ XubString ButtonDialog::GetButtonHelpText( USHORT nId ) const // ----------------------------------------------------------------------- -void ButtonDialog::SetButtonHelpId( USHORT nId, ULONG nHelpId ) +void ButtonDialog::SetButtonHelpId( USHORT nId, const rtl::OString& rHelpId ) { ImplBtnDlgItem* pItem = ImplGetItem( nId ); if ( pItem ) - pItem->mpPushButton->SetHelpId( nHelpId ); + pItem->mpPushButton->SetHelpId( rHelpId ); } // ----------------------------------------------------------------------- -ULONG ButtonDialog::GetButtonHelpId( USHORT nId ) const +rtl::OString ButtonDialog::GetButtonHelpId( USHORT nId ) const { ImplBtnDlgItem* pItem = ImplGetItem( nId ); - if ( pItem ) - return pItem->mpPushButton->GetHelpId(); - else - return 0; + return pItem ? rtl::OString( pItem->mpPushButton->GetHelpId() ) : rtl::OString(); } diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index e77eacb2fddf..b6f80588d776 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -157,7 +157,7 @@ struct MenuItemData XubString aTipHelpText; // TipHelp-String (eg, expanded filenames) XubString aCommandStr; // CommandString XubString aHelpCommandStr; // Help command string (to reference external help) - ULONG nHelpId; // Help-Id + rtl::OString aHelpId; // Help-Id ULONG nUserValue; // User value Image aImage; // Image KeyCode aAccelKey; // Accelerator-Key @@ -252,7 +252,6 @@ MenuItemData* MenuItemList::Insert( USHORT nId, MenuItemType eType, pData->nBits = nBits; pData->pSubMenu = NULL; pData->pAutoSubMenu = NULL; - pData->nHelpId = 0; pData->nUserValue = 0; pData->bChecked = FALSE; pData->bEnabled = TRUE; @@ -284,7 +283,6 @@ void MenuItemList::InsertSeparator( USHORT nPos ) pData->nBits = 0; pData->pSubMenu = NULL; pData->pAutoSubMenu = NULL; - pData->nHelpId = 0; pData->nUserValue = 0; pData->bChecked = FALSE; pData->bEnabled = TRUE; @@ -844,14 +842,14 @@ static BOOL ImplHandleHelpEvent( Window* pMenuWindow, Menu* pMenu, USHORT nHighl // Ist eine ID vorhanden, dann Hilfe mit der ID aufrufen, sonst // den Hilfe-Index String aCommand = pMenu->GetItemCommand( nId ); - ULONG nHelpId = pMenu->GetHelpId( nId ); + rtl::OString aHelpId( pMenu->GetHelpId( nId ) ); + if( ! aHelpId.getLength() ) + aHelpId = OOO_HELP_INDEX; if ( aCommand.Len() ) pHelp->Start( aCommand, NULL ); - else if ( nHelpId ) - pHelp->Start( nHelpId, NULL ); else - pHelp->Start( OOO_HELP_INDEX, NULL ); + pHelp->Start( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ), NULL ); } bDone = TRUE; } @@ -1330,15 +1328,14 @@ void Menu::InsertItem( const ResId& rResId, USHORT nPos ) SetHelpText( nItemId, aHelpText ); } - ULONG nHelpId = 0; if ( nObjMask & RSC_MENUITEM_HELPID ) { - nHelpId = ReadLongRes(); + rtl::OString aHelpId( ReadByteStringRes() ); if ( !bSep ) - SetHelpId( nItemId, nHelpId ); + SetHelpId( nItemId, aHelpId ); } - if( !bSep /* && SvHelpSettings::HelpText( aHelpText, nHelpId ) */ ) + if( !bSep ) SetHelpText( nItemId, aHelpText ); if ( nObjMask & RSC_MENUITEM_KEYCODE ) @@ -1463,7 +1460,7 @@ void ImplCopyItem( Menu* pThis, const Menu& rMenu, USHORT nPos, USHORT nNewPos, pThis->CheckItem( nId, TRUE ); if ( !rMenu.IsItemEnabled( nId ) ) pThis->EnableItem( nId, FALSE ); - pThis->SetHelpId( nId, pData->nHelpId ); + pThis->SetHelpId( nId, pData->aHelpId ); pThis->SetHelpText( nId, pData->aHelpText ); pThis->SetAccelKey( nId, pData->aAccelKey ); pThis->SetItemCommand( nId, pData->aCommandStr ); @@ -2039,7 +2036,7 @@ const XubString& Menu::ImplGetHelpText( USHORT nItemId ) const if ( pData ) { if ( !pData->aHelpText.Len() && - (( pData->nHelpId ) || ( pData->aCommandStr.Len() ))) + (( pData->aHelpId.getLength() ) || ( pData->aCommandStr.Len() ))) { Help* pHelp = Application::GetHelp(); if ( pHelp ) @@ -2047,8 +2044,8 @@ const XubString& Menu::ImplGetHelpText( USHORT nItemId ) const if ( pData->aCommandStr.Len() ) pData->aHelpText = pHelp->GetHelpText( pData->aCommandStr, NULL ); - if( !pData->aHelpText.Len() && pData->nHelpId ) - pData->aHelpText = pHelp->GetHelpText( pData->nHelpId, NULL ); + if( !pData->aHelpText.Len() && pData->aHelpId.getLength() ) + pData->aHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pData->aHelpId, RTL_TEXTENCODING_UTF8 ), NULL ); } } @@ -2081,22 +2078,29 @@ const XubString& Menu::GetTipHelpText( USHORT nItemId ) const return ImplGetSVEmptyStr(); } -void Menu::SetHelpId( USHORT nItemId, ULONG nHelpId ) +void Menu::SetHelpId( USHORT nItemId, const rtl::OString& rHelpId ) { MenuItemData* pData = pItemList->GetData( nItemId ); if ( pData ) - pData->nHelpId = nHelpId; + pData->aHelpId = rHelpId; } -ULONG Menu::GetHelpId( USHORT nItemId ) const +rtl::OString Menu::GetHelpId( USHORT nItemId ) const { + rtl::OString aRet; + MenuItemData* pData = pItemList->GetData( nItemId ); if ( pData ) - return pData->nHelpId; - else - return 0; + { + if ( pData->aHelpId.getLength() ) + aRet = pData->aHelpId; + else + aRet = ::rtl::OUStringToOString( pData->aCommandStr, RTL_TEXTENCODING_UTF8 ); + } + + return aRet; } Menu& Menu::operator=( const Menu& rMenu ) diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index 7f7a65cd7fb9..d00d569883d5 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -196,10 +196,9 @@ MessBox::MessBox( Window* pParent, const ResId& rResId ) : USHORT nLoButtons = ReadShortRes(); USHORT nHiDefButton = ReadShortRes(); USHORT nLoDefButton = ReadShortRes(); - USHORT nHiHelpId = ReadShortRes(); - USHORT nLoHelpId = ReadShortRes(); + rtl::OString aHelpId( ReadByteStringRes() ); /* USHORT bSysModal = */ ReadShortRes(); - SetHelpId( ((ULONG)nHiHelpId << 16) + nLoHelpId ); + SetHelpId( aHelpId ); WinBits nBits = (((ULONG)nHiButtons << 16) + nLoButtons) | (((ULONG)nHiDefButton << 16) + nLoDefButton); ImplInit( pParent, nBits | WB_MOVEABLE | WB_HORZ | WB_CENTER ); @@ -233,7 +232,7 @@ MessBox::~MessBox() void MessBox::ImplPosControls() { - if ( GetHelpId() ) + if ( GetHelpId().getLength() ) { if ( !mbHelpBtn ) { diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 9a22aa913ded..f24ed500b7df 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -46,7 +46,7 @@ #include "unotools/localedatawrapper.hxx" -#include "rtl/ustrbuf.hxx" +#include "rtl/strbuf.hxx" #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/container/XNameAccess.hpp" @@ -61,8 +61,8 @@ using namespace com::sun::star::container; using namespace com::sun::star::beans; #define HELPID_PREFIX ".HelpId:vcl:PrintDialog" -#define SMHID2( a, b ) SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( HELPID_PREFIX ":" a ":" b ) ), HID_PRINTDLG ) ) -#define SMHID1( a ) SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( HELPID_PREFIX ":" a ) ), HID_PRINTDLG ) ) +#define SMHID2( a, b ) SetHelpId( rtl::OString( HELPID_PREFIX ":" a ":" b ) ) +#define SMHID1( a ) SetHelpId( rtl::OString( HELPID_PREFIX ":" a ) ) PrintDialog::PrintPreviewWindow::PrintPreviewWindow( Window* i_pParent, const ResId& i_rId ) : Window( i_pParent, i_rId ) @@ -1127,24 +1127,24 @@ bool PrintDialog::isSingleJobs() static void setSmartId( Window* i_pWindow, const char* i_pType, sal_Int32 i_nId = -1, const rtl::OUString& i_rPropName = rtl::OUString() ) { - rtl::OUStringBuffer aBuf( 256 ); - aBuf.appendAscii( HELPID_PREFIX ); + rtl::OStringBuffer aBuf( 256 ); + aBuf.append( HELPID_PREFIX ); if( i_rPropName.getLength() ) { - aBuf.append( sal_Unicode( ':' ) ); - aBuf.append( i_rPropName ); + aBuf.append( ':' ); + aBuf.append( rtl::OUStringToOString( i_rPropName, RTL_TEXTENCODING_UTF8 ) ); } if( i_pType ) { - aBuf.append( sal_Unicode( ':' ) ); - aBuf.appendAscii( i_pType ); + aBuf.append( ':' ); + aBuf.append( i_pType ); } if( i_nId >= 0 ) { - aBuf.append( sal_Unicode( ':' ) ); + aBuf.append( ':' ); aBuf.append( i_nId ); } - i_pWindow->SetSmartHelpId( SmartId( aBuf.makeStringAndClear(), HID_PRINTDLG ) ); + i_pWindow->SetHelpId( aBuf.makeStringAndClear() ); } static void setHelpText( Window* /*i_pWindow*/, const Sequence< rtl::OUString >& /*i_rHelpTexts*/, sal_Int32 /*i_nIndex*/ ) @@ -2147,7 +2147,7 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton ) if( pHelp ) { // FIXME: find out proper help URL and use here - pHelp->Start( HID_PRINTDLG, GetParent() ); + pHelp->Start( rtl::OStringToOUString( GetHelpId(), RTL_TEXTENCODING_UTF8 ), GetParent() ); } } else if( pButton == &maForwardBtn ) diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index ba4ab7984c52..36f27b1ceee7 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -89,7 +89,7 @@ struct ImplStatusItem XubString maText; XubString maHelpText; XubString maQuickHelpText; - ULONG mnHelpId; + rtl::OString maHelpId; void* mpUserData; BOOL mbVisible; XubString maAccessibleName; @@ -906,9 +906,9 @@ void StatusBar::RequestHelp( const HelpEvent& rHEvt ) else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { String aCommand = GetItemCommand( nItemId ); - ULONG nHelpId = GetHelpId( nItemId ); + rtl::OString aHelpId( GetHelpId( nItemId ) ); - if ( aCommand.Len() || nHelpId ) + if ( aCommand.Len() || aHelpId.getLength() ) { // Wenn eine Hilfe existiert, dann ausloesen Help* pHelp = Application::GetHelp(); @@ -916,8 +916,8 @@ void StatusBar::RequestHelp( const HelpEvent& rHEvt ) { if ( aCommand.Len() ) pHelp->Start( aCommand, this ); - else if ( nHelpId ) - pHelp->Start( nHelpId, this ); + else if ( aHelpId.getLength() ) + pHelp->Start( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ), this ); } return; } @@ -1033,7 +1033,6 @@ void StatusBar::InsertItem( USHORT nItemId, ULONG nWidth, pItem->mnBits = nBits; pItem->mnWidth = (long)nWidth+nFudge+STATUSBAR_OFFSET; pItem->mnOffset = nOffset; - pItem->mnHelpId = 0; pItem->mpUserData = 0; pItem->mbVisible = TRUE; @@ -1475,15 +1474,15 @@ const XubString& StatusBar::GetHelpText( USHORT nItemId ) const if ( nPos != STATUSBAR_ITEM_NOTFOUND ) { ImplStatusItem* pItem = mpItemList->GetObject( nPos ); - if ( !pItem->maHelpText.Len() && ( pItem->mnHelpId || pItem->maCommand.Len() )) + if ( !pItem->maHelpText.Len() && ( pItem->maHelpId.getLength() || pItem->maCommand.Len() )) { Help* pHelp = Application::GetHelp(); if ( pHelp ) { if ( pItem->maCommand.Len() ) pItem->maHelpText = pHelp->GetHelpText( pItem->maCommand, this ); - if ( !pItem->maHelpText.Len() && pItem->mnHelpId ) - pItem->maHelpText = pHelp->GetHelpText( pItem->mnHelpId, this ); + if ( !pItem->maHelpText.Len() && pItem->maHelpId.getLength() ) + pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); } } @@ -1520,24 +1519,31 @@ const XubString& StatusBar::GetQuickHelpText( USHORT nItemId ) const // ----------------------------------------------------------------------- -void StatusBar::SetHelpId( USHORT nItemId, ULONG nHelpId ) +void StatusBar::SetHelpId( USHORT nItemId, const rtl::OString& rHelpId ) { USHORT nPos = GetItemPos( nItemId ); if ( nPos != STATUSBAR_ITEM_NOTFOUND ) - mpItemList->GetObject( nPos )->mnHelpId = nHelpId; + mpItemList->GetObject( nPos )->maHelpId = rHelpId; } // ----------------------------------------------------------------------- -ULONG StatusBar::GetHelpId( USHORT nItemId ) const +rtl::OString StatusBar::GetHelpId( USHORT nItemId ) const { USHORT nPos = GetItemPos( nItemId ); + rtl::OString aRet; if ( nPos != STATUSBAR_ITEM_NOTFOUND ) - return mpItemList->GetObject( nPos )->mnHelpId; - else - return 0; + { + ImplStatusItem* pItem = mpItemList->GetObject( nPos ); + if ( pItem->maHelpId.getLength() ) + aRet = pItem->maHelpId; + else + aRet = ::rtl::OUStringToOString( pItem->maCommand, RTL_TEXTENCODING_UTF8 ); + } + + return aRet; } // ----------------------------------------------------------------------- diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 4de6c88490f6..b71cf1c13c8d 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -4820,15 +4820,15 @@ const XubString& ToolBox::ImplGetHelpText( USHORT nItemId ) const if ( pItem ) { - if ( !pItem->maHelpText.Len() && ( pItem->mnHelpId || pItem->maCommandStr.Len() )) + if ( !pItem->maHelpText.Len() && ( pItem->maHelpId.getLength() || pItem->maCommandStr.Len() )) { Help* pHelp = Application::GetHelp(); if ( pHelp ) { if ( pItem->maCommandStr.Len() ) pItem->maHelpText = pHelp->GetHelpText( pItem->maCommandStr, this ); - if ( !pItem->maHelpText.Len() && pItem->mnHelpId ) - pItem->maHelpText = pHelp->GetHelpText( pItem->mnHelpId, this ); + if ( !pItem->maHelpText.Len() && pItem->maHelpId.getLength() ) + pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); } } @@ -4894,9 +4894,9 @@ void ToolBox::RequestHelp( const HelpEvent& rHEvt ) else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { String aCommand = GetItemCommand( nItemId ); - ULONG nHelpId = GetHelpId( nItemId ); + rtl::OString aHelpId( GetHelpId( nItemId ) ); - if ( aCommand.Len() || nHelpId ) + if ( aCommand.Len() || aHelpId.getLength() ) { // Wenn eine Hilfe existiert, dann ausloesen Help* pHelp = Application::GetHelp(); @@ -4904,8 +4904,8 @@ void ToolBox::RequestHelp( const HelpEvent& rHEvt ) { if ( aCommand.Len() ) pHelp->Start( aCommand, this ); - else if ( nHelpId ) - pHelp->Start( nHelpId, this ); + else if ( aHelpId.getLength() ) + pHelp->Start( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ), this ); } return; } diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 334cdd2d0a64..35a39676353a 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -99,7 +99,6 @@ ImplToolItem::ImplToolItem() mnId = 0; mpWindow = NULL; mpUserData = NULL; - mnHelpId = 0; meType = TOOLBOXITEM_BUTTON; mnBits = 0; meState = STATE_NOCHECK; @@ -124,7 +123,6 @@ ImplToolItem::ImplToolItem( USHORT nItemId, const Image& rImage, mnId = nItemId; mpWindow = NULL; mpUserData = NULL; - mnHelpId = 0; meType = TOOLBOXITEM_BUTTON; mnBits = nItemBits; meState = STATE_NOCHECK; @@ -149,7 +147,6 @@ ImplToolItem::ImplToolItem( USHORT nItemId, const XubString& rText, mnId = nItemId; mpWindow = NULL; mpUserData = NULL; - mnHelpId = 0; meType = TOOLBOXITEM_BUTTON; mnBits = nItemBits; meState = STATE_NOCHECK; @@ -175,7 +172,6 @@ ImplToolItem::ImplToolItem( USHORT nItemId, const Image& rImage, mnId = nItemId; mpWindow = NULL; mpUserData = NULL; - mnHelpId = 0; meType = TOOLBOXITEM_BUTTON; mnBits = nItemBits; meState = STATE_NOCHECK; @@ -204,7 +200,7 @@ ImplToolItem::ImplToolItem( const ImplToolItem& rItem ) : maQuickHelpText ( rItem.maQuickHelpText ), maHelpText ( rItem.maHelpText ), maCommandStr ( rItem.maCommandStr ), - mnHelpId ( rItem.mnHelpId ), + maHelpId ( rItem.maHelpId ), maRect ( rItem.maRect ), maCalcRect ( rItem.maCalcRect ), maItemSize ( rItem.maItemSize ), @@ -243,7 +239,7 @@ ImplToolItem& ImplToolItem::operator=( const ImplToolItem& rItem ) maQuickHelpText = rItem.maQuickHelpText; maHelpText = rItem.maHelpText; maCommandStr = rItem.maCommandStr; - mnHelpId = rItem.mnHelpId; + maHelpId = rItem.maHelpId; maRect = rItem.maRect; maCalcRect = rItem.maCalcRect; mnSepSize = rItem.mnSepSize; @@ -595,7 +591,7 @@ void ToolBox::InsertItem( const ResId& rResId, USHORT nPos ) aItem.mnBits = (ToolBoxItemBits)ReadLongRes(); if( nObjMask & RSC_TOOLBOXITEM_HELPID ) - aItem.mnHelpId = ReadLongRes(); + aItem.maHelpId = ReadByteStringRes(); if ( nObjMask & RSC_TOOLBOXITEM_TEXT ) { @@ -1923,24 +1919,31 @@ const XubString& ToolBox::GetHelpText( USHORT nItemId ) const // ----------------------------------------------------------------------- -void ToolBox::SetHelpId( USHORT nItemId, ULONG nHelpId ) +void ToolBox::SetHelpId( USHORT nItemId, const rtl::OString& rHelpId ) { ImplToolItem* pItem = ImplGetItem( nItemId ); if ( pItem ) - pItem->mnHelpId = nHelpId; + pItem->maHelpId = rHelpId; } // ----------------------------------------------------------------------- -ULONG ToolBox::GetHelpId( USHORT nItemId ) const +rtl::OString ToolBox::GetHelpId( USHORT nItemId ) const { + rtl::OString aRet; + ImplToolItem* pItem = ImplGetItem( nItemId ); if ( pItem ) - return pItem->mnHelpId; - else - return 0; + { + if ( pItem->maHelpId.getLength() ) + aRet = pItem->maHelpId; + else + aRet = ::rtl::OUStringToOString( pItem->maCommandStr, RTL_TEXTENCODING_UTF8 ); + } + + return aRet; } // ----------------------------------------------------------------------- diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index adedbde4c0f2..e5705c994f4f 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -612,8 +612,6 @@ void Window::ImplInitWindowData( WindowType nType ) mpWindowImpl->mnX = 0; // X-Position to Parent mpWindowImpl->mnY = 0; // Y-Position to Parent mpWindowImpl->mnAbsScreenX = 0; // absolute X-position on screen, used for RTL window positioning - mpWindowImpl->mnHelpId = 0; // help id - mpWindowImpl->mnUniqId = 0; // unique id mpWindowImpl->mpChildClipRegion = NULL; // Child-Clip-Region when ClipChildren mpWindowImpl->mpPaintRegion = NULL; // Paint-ClipRegion mpWindowImpl->mnStyle = 0; // style (init in ImplInitWindow) @@ -1179,20 +1177,14 @@ void Window::ImplCallMove() // ----------------------------------------------------------------------- -static ULONG ImplAutoHelpID( ResMgr* pResMgr ) +static rtl::OString ImplAutoHelpID( ResMgr* pResMgr ) { - if ( !Application::IsAutoHelpIdEnabled() ) - return 0; - - ULONG nHID = 0; + rtl::OString aRet; - DBG_ASSERT( pResMgr, "No res mgr for auto help id" ); - if( ! pResMgr ) - return 0; + if( pResMgr && Application::IsAutoHelpIdEnabled() ) + aRet = pResMgr->GetAutoHelpId(); - nHID = pResMgr->GetAutoHelpId(); - - return nHID; + return aRet; } // ----------------------------------------------------------------------- @@ -1212,22 +1204,23 @@ WinBits Window::ImplInitRes( const ResId& rResId ) void Window::ImplLoadRes( const ResId& rResId ) { - // newer move this line after IncrementRes - char* pRes = (char*)GetClassRes(); - pRes += 12; - sal_uInt32 nHelpId = (sal_uInt32)GetLongRes( (void*)pRes ); - if ( !nHelpId ) - nHelpId = ImplAutoHelpID( rResId.GetResMgr() ); - SetHelpId( nHelpId ); - ULONG nObjMask = ReadLongRes(); + // we need to calculate auto helpids before the resource gets closed + // if the resource only contains flags, it will be closed before we try to read a help id + // so we always create an auto help id that might be overwritten later + // HelpId + rtl::OString aHelpId = ImplAutoHelpID( rResId.GetResMgr() ); + // ResourceStyle ULONG nRSStyle = ReadLongRes(); // WinBits ReadLongRes(); - // HelpId - ReadLongRes(); + + if( nObjMask & WINDOW_HELPID ) + aHelpId = ReadByteStringRes(); + + SetHelpId( aHelpId ); BOOL bPos = FALSE; BOOL bSize = FALSE; @@ -1294,7 +1287,7 @@ void Window::ImplLoadRes( const ResId& rResId ) if ( nObjMask & WINDOW_EXTRALONG ) SetData( (void*)ReadLongRes() ); if ( nObjMask & WINDOW_UNIQUEID ) - SetUniqueId( (ULONG)ReadLongRes() ); + SetUniqueId( ReadByteStringRes() ); if ( nObjMask & WINDOW_BORDER_STYLE ) { @@ -1322,8 +1315,6 @@ ImplWinData* Window::ImplGetWinData() const mpWindowImpl->mpWinData->mnIsTopWindow = (USHORT) ~0; // not initialized yet, 0/1 will indicate TopWindow (see IsTopWindow()) mpWindowImpl->mpWinData->mbMouseOver = FALSE; mpWindowImpl->mpWinData->mbEnableNativeWidget = (pNoNWF && *pNoNWF) ? FALSE : TRUE; // TRUE: try to draw this control with native theme API - mpWindowImpl->mpWinData->mpSmartHelpId = NULL; - mpWindowImpl->mpWinData->mpSmartUniqueId = NULL; } return mpWindowImpl->mpWinData; @@ -4734,10 +4725,6 @@ Window::~Window() delete mpWindowImpl->mpWinData->mpFocusRect; if ( mpWindowImpl->mpWinData->mpTrackRect ) delete mpWindowImpl->mpWinData->mpTrackRect; - if ( mpWindowImpl->mpWinData->mpSmartHelpId ) - delete mpWindowImpl->mpWinData->mpSmartHelpId; - if ( mpWindowImpl->mpWinData->mpSmartUniqueId ) - delete mpWindowImpl->mpWinData->mpSmartUniqueId; delete mpWindowImpl->mpWinData; } @@ -4979,29 +4966,18 @@ void Window::RequestHelp( const HelpEvent& rHEvt ) } else { - SmartId aSmartId = GetSmartHelpId(); - - ULONG nNumHelpId = 0; - String aStrHelpId; - if( aSmartId.HasString() ) - aStrHelpId = aSmartId.GetStr(); - if( aSmartId.HasNumeric() ) - nNumHelpId = aSmartId.GetNum(); - - if ( !nNumHelpId && aStrHelpId.Len() == 0 && ImplGetParent() ) + String aStrHelpId( rtl::OStringToOUString( GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); + if ( aStrHelpId.Len() == 0 && ImplGetParent() ) ImplGetParent()->RequestHelp( rHEvt ); else { - if ( !nNumHelpId && aStrHelpId.Len() == 0 ) - nNumHelpId = OOO_HELP_INDEX; - Help* pHelp = Application::GetHelp(); if ( pHelp ) { if( aStrHelpId.Len() > 0 ) pHelp->Start( aStrHelpId, this ); else - pHelp->Start( nNumHelpId, this ); + pHelp->Start( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OOO_HELP_INDEX ) ), this ); } } } @@ -8130,32 +8106,22 @@ const XubString& Window::GetHelpText() const { DBG_CHKTHIS( Window, ImplDbgCheckWindow ); - SmartId aSmartId = GetSmartHelpId(); - - ULONG nNumHelpId = 0; - String aStrHelpId; - if( aSmartId.HasString() ) - aStrHelpId = aSmartId.GetStr(); - if( aSmartId.HasNumeric() ) - nNumHelpId = aSmartId.GetNum(); + String aStrHelpId( rtl::OStringToOUString( GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); bool bStrHelpId = (aStrHelpId.Len() > 0); - if ( !mpWindowImpl->maHelpText.Len() && (nNumHelpId || bStrHelpId) ) + if ( !mpWindowImpl->maHelpText.Len() && bStrHelpId ) { if ( !IsDialog() && (mpWindowImpl->mnType != WINDOW_TABPAGE) && (mpWindowImpl->mnType != WINDOW_FLOATINGWINDOW) ) { Help* pHelp = Application::GetHelp(); if ( pHelp ) { - if( bStrHelpId ) - ((Window*)this)->mpWindowImpl->maHelpText = pHelp->GetHelpText( aStrHelpId, this ); - else - ((Window*)this)->mpWindowImpl->maHelpText = pHelp->GetHelpText( nNumHelpId, this ); + ((Window*)this)->mpWindowImpl->maHelpText = pHelp->GetHelpText( aStrHelpId, this ); mpWindowImpl->mbHelpTextDynamic = FALSE; } } } - else if( mpWindowImpl->mbHelpTextDynamic && (nNumHelpId || bStrHelpId) ) + else if( mpWindowImpl->mbHelpTextDynamic && bStrHelpId ) { static const char* pEnv = getenv( "HELP_DEBUG" ); if( pEnv && *pEnv ) @@ -8163,10 +8129,7 @@ const XubString& Window::GetHelpText() const rtl::OUStringBuffer aTxt( 64+mpWindowImpl->maHelpText.Len() ); aTxt.append( mpWindowImpl->maHelpText ); aTxt.appendAscii( "\n------------------\n" ); - if( bStrHelpId ) - aTxt.append( rtl::OUString( aStrHelpId ) ); - else - aTxt.append( sal_Int32( nNumHelpId ) ); + aTxt.append( rtl::OUString( aStrHelpId ) ); mpWindowImpl->maHelpText = aTxt.makeStringAndClear(); } mpWindowImpl->mbHelpTextDynamic = FALSE; diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 02b2713b01cc..e5b58a8b6f3c 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -1442,115 +1442,31 @@ Window* Window::ImplGetTopmostFrameWindow() return pTopmostParent->mpWindowImpl->mpFrameWindow; } -// making these Methods out of line to be able to change them lateron without complete rebuild -// TODO: Set the SmartId in here and remove mpWindowImpl->mnHelpId -void Window::SetHelpId( ULONG nHelpId ) +void Window::SetHelpId( const rtl::OString& rHelpId ) { - SetSmartHelpId(SmartId(nHelpId)); + mpWindowImpl->maHelpId = rHelpId; } -ULONG Window::GetHelpId() const +const rtl::OString& Window::GetHelpId() const { - return mpWindowImpl->mnHelpId; + return mpWindowImpl->maHelpId; } -void Window::SetSmartHelpId( const SmartId& aId, SmartIdUpdateMode aMode ) +void Window::SetUniqueId( const rtl::OString& rUniqueId ) { - // create SmartId if required - if ( (aMode == SMART_SET_STR) || (aMode == SMART_SET_ALL) || ( (aMode == SMART_SET_SMART) && aId.HasString() ) ) - { - if ( !ImplGetWinData()->mpSmartHelpId ) - ImplGetWinData()->mpSmartHelpId = new SmartId(); - } - - // if we have a SmartId (eather from earlier call or just created) fill with new values - if ( mpWindowImpl->mpWinData && mpWindowImpl->mpWinData->mpSmartHelpId ) - ImplGetWinData()->mpSmartHelpId->UpdateId( aId, aMode ); - - if ( (aMode == SMART_SET_NUM) || (aMode == SMART_SET_ALL) || ( (aMode == SMART_SET_SMART) && aId.HasNumeric() ) ) - { - mpWindowImpl->mnHelpId = aId.GetNum(); - } -} - -SmartId Window::GetSmartHelpId() const -{ - if ( mpWindowImpl->mpWinData && mpWindowImpl->mpWinData->mpSmartHelpId ) - { - if ( mpWindowImpl->mnHelpId || mpWindowImpl->mpWinData->mpSmartHelpId->HasNumeric() ) - mpWindowImpl->mpWinData->mpSmartHelpId->UpdateId( SmartId( mpWindowImpl->mnHelpId ), SMART_SET_NUM ); - return *mpWindowImpl->mpWinData->mpSmartHelpId; - } - else - { - if ( mpWindowImpl->mnHelpId ) - return SmartId( mpWindowImpl->mnHelpId ); - else - return SmartId(); - } -} - - -// making these Methods out of line to be able to change them lateron without complete rebuild -// TODO: Set the SmartId in here and remove mpWindowImpl->mnUniqId -void Window::SetUniqueId( ULONG nUniqueId ) { mpWindowImpl->mnUniqId = nUniqueId; } -ULONG Window::GetUniqueId() const { return mpWindowImpl->mnUniqId; } - - -void Window::SetSmartUniqueId( const SmartId& aId, SmartIdUpdateMode aMode ) -{ - // create SmartId if required - if ( (aMode == SMART_SET_STR) || (aMode == SMART_SET_ALL) || ( (aMode == SMART_SET_SMART) && aId.HasString() ) ) - { - if ( !ImplGetWinData()->mpSmartUniqueId ) - ImplGetWinData()->mpSmartUniqueId = new SmartId(); - } - - // if we have a SmartId (eather from earlier call or just created) fill with new values - if ( mpWindowImpl->mpWinData && mpWindowImpl->mpWinData->mpSmartUniqueId ) - ImplGetWinData()->mpSmartUniqueId->UpdateId( aId, aMode ); - - if ( (aMode == SMART_SET_NUM) || (aMode == SMART_SET_ALL) || ( (aMode == SMART_SET_SMART) && aId.HasNumeric() ) ) - mpWindowImpl->mnUniqId = aId.GetNum(); + mpWindowImpl->maUniqId = rUniqueId; } -SmartId Window::GetSmartUniqueId() const +const rtl::OString& Window::GetUniqueId() const { - if ( mpWindowImpl->mpWinData && mpWindowImpl->mpWinData->mpSmartUniqueId ) - { - if ( mpWindowImpl->mnUniqId || mpWindowImpl->mpWinData->mpSmartUniqueId->HasNumeric() ) - mpWindowImpl->mpWinData->mpSmartUniqueId->UpdateId( SmartId( mpWindowImpl->mnUniqId ), SMART_SET_NUM ); - return *mpWindowImpl->mpWinData->mpSmartUniqueId; - } - else - { - if ( mpWindowImpl->mnUniqId ) - return SmartId( mpWindowImpl->mnUniqId ); - else - return SmartId(); - } + return mpWindowImpl->maUniqId; } -SmartId Window::GetSmartUniqueOrHelpId() const +const rtl::OString& Window::GetUniqueOrHelpId() const { - if ( ( mpWindowImpl->mpWinData && mpWindowImpl->mpWinData->mpSmartHelpId ) || mpWindowImpl->mnHelpId ) - { - if ( ( mpWindowImpl->mpWinData && mpWindowImpl->mpWinData->mpSmartUniqueId ) || mpWindowImpl->mnUniqId ) - { - SmartId aTemp = GetSmartHelpId(); - aTemp.UpdateId( GetSmartUniqueId() ); - return aTemp; - } - else - return GetSmartHelpId(); - } - else - return GetSmartUniqueId(); + return mpWindowImpl->maUniqId.getLength() ? mpWindowImpl->maUniqId : mpWindowImpl->maHelpId; } - - - // --------- old inline methods --------------- Window* Window::ImplGetWindow() diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 447a970f6bcd..318f593ac6a3 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -411,6 +411,9 @@ void GtkData::initNWF( void ) // open first menu on F10 pSVData->maNWFData.mbOpenMenuOnF10 = true; + // omit GetNativeControl while painting (see brdwin.cxx) + pSVData->maNWFData.mbCanDrawWidgetAnySize = true; + int nScreens = GetX11SalData()->GetDisplay()->GetScreenCount(); gWidgetData = std::vector<NWFWidgetData>( nScreens ); for( int i = 0; i < nScreens; i++ ) diff --git a/vcl/unx/source/fontmanager/fontconfig.cxx b/vcl/unx/source/fontmanager/fontconfig.cxx index ecb4aa54549b..434263db352e 100644 --- a/vcl/unx/source/fontmanager/fontconfig.cxx +++ b/vcl/unx/source/fontmanager/fontconfig.cxx @@ -454,20 +454,33 @@ void FontCfgWrapper::addFontSet( FcSetName eSetName ) for( int i = 0; i < pOrig->nfont; ++i ) { FcPattern* pOrigPattern = pOrig->fonts[i]; - // create a pattern to find eventually better alternatives - FcPattern* pTestPattern = FcPatternDuplicate( pOrigPattern ); - FcPatternAddBool( pTestPattern, FC_OUTLINE, FcTrue ); - // TODO: use pattern->ImplFontAttr->pattern to filter out - // all attribute that are not interesting for finding dupes - FcPatternDel( pTestPattern, FC_FONTVERSION ); - FcPatternDel( pTestPattern, FC_CHARSET ); - FcPatternDel( pTestPattern, FC_FILE ); - // find the font face for the dupe-search pattern - FcResult eFcResult = FcResultMatch; - FcPattern* pBetterPattern = FcFontMatch( FcConfigGetCurrent(), pTestPattern, &eFcResult ); - FcPatternDestroy( pTestPattern ); - if( eFcResult != FcResultMatch ) + // #i115131# ignore non-outline fonts + FcBool bOutline = FcFalse; + FcResult eOutRes = FcPatternGetBool( pOrigPattern, FC_OUTLINE, 0, &bOutline ); + if( (eOutRes != FcResultMatch) || (bOutline == FcFalse) ) continue; + // create a pattern to find eventually better alternatives + FcPattern* pBetterPattern = pOrigPattern; + if( m_nFcVersion > 20400 ) // #i115204# avoid trouble with old FC versions + { + FcPattern* pTestPattern = FcPatternDuplicate( pOrigPattern ); + FcPatternAddBool( pTestPattern, FC_OUTLINE, FcTrue ); + // TODO: ignore all attributes that are not interesting for finding dupes + // e.g. by using pattern->ImplFontAttr->pattern conversion + FcPatternDel( pTestPattern, FC_FONTVERSION ); + FcPatternDel( pTestPattern, FC_CHARSET ); + FcPatternDel( pTestPattern, FC_FILE ); + // find the font face for the dupe-search pattern + FcResult eFcResult = FcResultMatch; + pBetterPattern = FcFontMatch( FcConfigGetCurrent(), pTestPattern, &eFcResult ); + FcPatternDestroy( pTestPattern ); + if( eFcResult != FcResultMatch ) + continue; + // #i115131# double check results and eventually ignore them + eOutRes = FcPatternGetBool( pBetterPattern, FC_OUTLINE, 0, &bOutline ); + if( (eOutRes != FcResultMatch) || (bOutline == FcFalse) ) + continue; + } // insert best found pattern for the dupe-search pattern // TODO: skip inserting patterns that are already known in the target fontset FcPatternReference( pBetterPattern ); @@ -773,7 +786,10 @@ int PrintFontManager::countFontconfigFonts( std::hash_map<rtl::OString, int, rtl #endif } if( aFonts.empty() ) + { + // TODO: remove fonts unusable to psprint from fontset continue; + } int nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, OStringToOUString( OString( (sal_Char*)family ), RTL_TEXTENCODING_UTF8 ), sal_True ); PrintFont* pUpdate = aFonts.front(); @@ -1103,6 +1119,7 @@ bool PrintFontManager::getFontOptions( ImplFontOptions& rOptions) const { #ifndef ENABLE_FONTCONFIG + (void)rInfo;(void)nSize;(void)subcallback;(void)rOptions; return false; #else // ENABLE_FONTCONFIG FontCfgWrapper& rWrapper = FontCfgWrapper::get(); |