diff options
Diffstat (limited to 'wizards/com/sun/star')
6 files changed, 5 insertions, 302 deletions
diff --git a/wizards/com/sun/star/wizards/common/Configuration.py b/wizards/com/sun/star/wizards/common/Configuration.py index 8f505582c662..1b6db1f9c886 100644 --- a/wizards/com/sun/star/wizards/common/Configuration.py +++ b/wizards/com/sun/star/wizards/common/Configuration.py @@ -97,17 +97,6 @@ class Configuration(object): return aLocLocale @classmethod - def getOfficeLinguistic(self, xMSF): - try: - oMasterKey = self.getConfigurationRoot(xMSF, - "org.openoffice.Setup/L10N/", False) - sLinguistic = Helper.getUnoObjectbyName(oMasterKey, "ooLocale") - return sLinguistic - except Exception, exception: - traceback.print_exc() - return None - - @classmethod def removeNode(self, configView, name, xmsf=None): commitChanges = False if xmsf is not None: diff --git a/wizards/com/sun/star/wizards/common/Resource.py b/wizards/com/sun/star/wizards/common/Resource.py index 68f60a767522..2e5b1424672f 100644 --- a/wizards/com/sun/star/wizards/common/Resource.py +++ b/wizards/com/sun/star/wizards/common/Resource.py @@ -34,9 +34,6 @@ class Resource(object): raise Exception ("could not initialize ResourceIndexAccess") self.xStringIndexAccess = xResource.getByName("String") - self.xStringListIndexAccess = xResource.getByName("StringList") - if self.xStringListIndexAccess is None: - raise Exception ("could not initialize xStringListIndexAccess") if self.xStringIndexAccess is None: raise Exception ("could not initialize xStringIndexAccess") @@ -52,13 +49,6 @@ class Resource(object): traceback.print_exc() raise ValueError("Resource with ID not " + str(nID) + " not found") - def getStringList(self, nID): - try: - return self.xStringListIndexAccess.getByIndex(nID) - except Exception, exception: - traceback.print_exc() - raise ValueError("Resource with ID not " + str(nID) + " not found") - def getResArray(self, nID, iCount): try: ResArray = range(iCount) diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py index fc1abe8c8534..584eaa2c196a 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py @@ -299,6 +299,7 @@ class FaxWizardDialogImpl(FaxWizardDialog): self.sWorkPath = FileAccess.getOfficePath2(xMSF, "Work", "", "") self.BusinessFiles = FileAccess.getFolderTitles(xMSF, "bus", self.sFaxPath, self.resources.dictBusinessTemplate) + print self.BusinessFiles self.PrivateFiles = FileAccess.getFolderTitles(xMSF, "pri", self.sFaxPath, self.resources.dictPrivateTemplate) diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py index e4b5bfd2e354..b53a32ce585a 100644 --- a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py +++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py @@ -547,21 +547,6 @@ class LetterWizardDialog(WizardDialog): "lblTitle2", 91, 8, 2, 91, 212)) def buildStep3(self): - self.lstLetterNorm = self.insertListBox( - "lstLetterNorm", - LSTLETTERNORM_ACTION_PERFORMED, - LSTLETTERNORM_ITEM_CHANGED, - ("Dropdown", - PropertyNames.PROPERTY_HEIGHT, - PropertyNames.PROPERTY_HELPURL, - PropertyNames.PROPERTY_NAME, - PropertyNames.PROPERTY_POSITION_X, - PropertyNames.PROPERTY_POSITION_Y, - PropertyNames.PROPERTY_STEP, - PropertyNames.PROPERTY_TABINDEX, - PropertyNames.PROPERTY_WIDTH), - (True, 12, HelpIds.getHelpIdString(HID + 21), - "lstLetterNorm", 210, 34, 3, 21, 74), self) self.chkUseLogo = self.insertCheckBox( "chkUseLogo", CHKUSELOGO_ITEM_CHANGED, (PropertyNames.PROPERTY_HEIGHT, diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py index 307080058221..0f68929f2a36 100644 --- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py +++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py @@ -62,8 +62,6 @@ class LetterWizardDialogImpl(LetterWizardDialog): self.BusCompanyAddress = None self.BusCompanyAddressReceiver = None self.BusFooter = None - self.Norms = [] - self.NormPaths = [] @classmethod def main(self): @@ -97,7 +95,6 @@ class LetterWizardDialogImpl(LetterWizardDialog): self.buildStep5() self.buildStep6() self.__initializePaths() - self.initializeNorms() self.initializeSalutation() self.initializeGreeting() @@ -106,10 +103,6 @@ class LetterWizardDialogImpl(LetterWizardDialog): self.myConfig = CGLetterWizard() - oL = self.getOfficeLinguistic() - self.myConfig.cp_BusinessLetter.cp_Norm = oL - self.myConfig.cp_PrivateOfficialLetter.cp_Norm = oL - self.myConfig.cp_PrivateLetter.cp_Norm = oL self.initializeTemplates(xMSF) #load the last used settings @@ -800,25 +793,6 @@ class LetterWizardDialogImpl(LetterWizardDialog): self.disableBusinessPaper() self.setPossibleSenderData(True) - def getOfficeLinguistic(self): - oL = 0 - found = False - OfficeLinguistic = Configuration.getOfficeLinguistic(self.xMSF) - i = 0 - for index, workwith in enumerate(self.Norms): - if workwith.lower() == OfficeLinguistic.lower(): - oL = index - found = True - break - - if not found: - for index, workwith in enumerate(self.Norms): - if workwith.lower() == "en-US".lower(): - oL = index - found = True - break - return oL - def setPossibleSenderData(self, bState): self.setControlProperty( "optSenderDefine", PropertyNames.PROPERTY_ENABLED, bState) @@ -898,18 +872,6 @@ class LetterWizardDialogImpl(LetterWizardDialog): except Exception: traceback.print_exc() - def lstLetterNormItemChanged(self): - sCurrentNorm = self.Norms[getCurrentLetter().cp_Norm] - initializeTemplates(xMSF) - if self.optBusinessLetter.State: - self.lstBusinessStyleItemChanged() - - elif optPrivOfficialLetter.State: - self.lstPrivOfficialStyleItemChanged() - - elif optPrivateLetter.State: - self.lstPrivateStyleItemChanged() - def initializeSalutation(self): self.setControlProperty( "lstSalutation", "StringItemList", @@ -919,55 +881,6 @@ class LetterWizardDialogImpl(LetterWizardDialog): self.setControlProperty( "lstGreeting", "StringItemList", self.resources.GreetingLabels) - def initializeNorms(self): - lc = LocaleCodes(self.xmsf) - allLocales = lc.getIDs() - nameList = [] - sLetterSubPath = "/wizard/letter/" - try: - self.sTemplatePath = \ - FileAccess.deleteLastSlashfromUrl(self.sTemplatePath) - nuString = \ - self.sTemplatePath[:self.sTemplatePath.rfind("/")] + "/" - sMainPath = FileAccess.deleteLastSlashfromUrl(nuString) - self.sLetterPath = sMainPath + sLetterSubPath - xInterface = \ - self.xmsf.createInstance("com.sun.star.ucb.SimpleFileAccess") - nameList = xInterface.getFolderContents(self.sLetterPath, True) - except Exception, e: - traceback.print_exc() - - found = False - cIsoCode = "" - MSID = "" - LanguageLabels = [] - - for i in nameList: - found = False - cIsoCode = FileAccess.getFilename(i) - for j in allLocales: - aLang = j.split(";") - if cIsoCode.lower() == aLang[1].lower(): - MSID = aLang[2] - found = True - break - - if not found: - for j in allLocales: - aLang = j.split(";") - if cIsoCode.lower() == aLang[1][:2]: - MSID = aLang[2] - found = True - break - - if found: - self.Norms.append(cIsoCode) - self.NormPaths.append(i) - #LanguageLabels.append(lc.getLanguageString(MSID)) - - self.setControlProperty( - "lstLetterNorm", "StringItemList", tuple(LanguageLabels)) - def getCurrentLetter(self): if self.myConfig.cp_LetterType == 0: return self.myConfig.cp_BusinessLetter @@ -985,15 +898,12 @@ class LetterWizardDialogImpl(LetterWizardDialog): self.xMSF, "Template", "share", "/wizard") self.sUserTemplatePath = \ FileAccess.getOfficePath2(self.xMSF, "Template", "user", "") - self.sBitmapPath = \ - FileAccess.combinePaths( - self.xMSF, self.sTemplatePath, "/../wizard/bitmap") except NoValidPathException, e: traceback.print_exc() def initializeTemplates(self, xMSF): - self.sCurrentNorm = self.Norms[self.getCurrentLetter().cp_Norm] - sLetterPath = self.NormPaths[self.getCurrentLetter().cp_Norm] + sLetterPath = FileAccess.combinePaths( + xMSF, self.sTemplatePath, "/../common/wizard/letter") self.BusinessFiles = \ FileAccess.getFolderTitles(xMSF, "bus", sLetterPath) self.OfficialFiles = \ @@ -1146,8 +1056,6 @@ class LetterWizardDialogImpl(LetterWizardDialog): cgl, "cp_PaperFooter", self.chkPaperFooter, True).updateUI() UnoDataAware.attachNumericControl( cgl, "cp_PaperFooterHeight", self.numFooterHeight, True).updateUI() - UnoDataAware.attachListBox( - cgl, "cp_Norm", self.lstLetterNorm, True).updateUI() UnoDataAware.attachCheckBox( cgl, "cp_PrintCompanyLogo", self.chkUseLogo, True).updateUI() UnoDataAware.attachCheckBox( @@ -1207,7 +1115,8 @@ class LetterWizardDialogImpl(LetterWizardDialog): def saveConfiguration(self): try: - root = Configuration.getConfigurationRoot(self.xMSF, "/org.openoffice.Office.Writer/Wizards/Letter", True) + root = Configuration.getConfigurationRoot(self.xMSF, + "/org.openoffice.Office.Writer/Wizards/Letter", True) self.myConfig.writeConfiguration(root, "cp_") root.commitChanges() except Exception, e: diff --git a/wizards/com/sun/star/wizards/letter/LocaleCodes.py b/wizards/com/sun/star/wizards/letter/LocaleCodes.py deleted file mode 100644 index 850dda11f195..000000000000 --- a/wizards/com/sun/star/wizards/letter/LocaleCodes.py +++ /dev/null @@ -1,171 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# -from wizards.common.Resource import Resource - -class LocaleCodes(Resource): - UNIT_NAME = "svtres", - MODULE_NAME = "svt", - - def __init__(self, xmsf): - super(LocaleCodes, self).__init__(xmsf, LocaleCodes.MODULE_NAME) - #self.allLanguageStrings = self.getStringList(16633) - - def getLanguageString(self, MSID): - LS = "unknown Language", - for i in self.allLanguageStrings: - if str(i.Value).lower() == MSID.lower(): - LS = i.Name - return LS - - def getIDs(self): - Ids = ("Afrikaans;af;1078", - "Albanian;sq;1052", - "Arabic - United Arab Emirates;ar-ae;14337", - "Arabic - Bahrain;ar-bh;15361", - "Arabic - Algeria;ar-dz;5121", - "Arabic - Egypt;ar-eg;3073", - "Arabic - Iraq;ar-iq;2049", - "Arabic - Jordan;ar-jo;11265", - "Arabic - Kuwait;ar-kw;13313", - "Arabic - Lebanon;ar-lb;12289", - "Arabic - Libya;ar-ly;4097", - "Arabic - Morocco;ar-ma;6145", - "Arabic - Oman;ar-om;8193", - "Arabic - Qatar;ar-qa;16385", - "Arabic - Saudi Arabia;ar-sa;1025", - "Arabic - Syria;ar-sy;10241", - "Arabic - Tunisia;ar-tn;7169", - "Arabic - Yemen;ar-ye;9217", - "Armenian;hy;1067", - "Azeri - Latin;az-az;1068", - "Azeri - Cyrillic;az-az;2092", - "Basque;eu;1069", - "Belarusian;be;1059", - "Bulgarian;bg;1026", - "Catalan;ca;1027", - "Chinese - China;zh-cn;2052", - "Chinese - Hong Kong SAR;zh-hk;3076", - "Chinese - Macau SAR;zh-mo;5124", - "Chinese - Singapore;zh-sg;4100", - "Chinese - Taiwan;zh-tw;1028", - "Croatian;hr;1050", - "Czech;cs;1029", - "Danish;da;1030", - "Dutch - The Netherlands;nl-nl;1043", - "Dutch - Belgium;nl-be;2067", - "English - Australia;en-au;3081", - "English - Belize;en-bz;10249", - "English - Canada;en-ca;4105", - "English - Caribbean;en-cb;9225", - "English - Ireland;en-ie;6153", - "English - Jamaica;en-jm;8201", - "English - New Zealand;en-nz;5129", - "English - Phillippines;en-ph;13321", - "English - South Africa;en-za;7177", - "English - Trinidad;en-tt;11273", - "English - United Kingdom;en-gb;2057", - "English - United States;en-us;1033", - "Estonian;et;1061", - "Farsi;fa;1065", - "Finnish;fi;1035", - "Faroese;fo;1080", - "French - France;fr-fr;1036", - "French - Belgium;fr-be;2060", - "French - Canada;fr-ca;3084", - "French - Luxembourg;fr-lu;5132", - "French - Switzerland;fr-ch;4108", - "Gaelic - Ireland;gd-ie;2108", - "Gaelic - Scotland;gd;1084", - "German - Germany;de-de;1031", - "German - Austria;de-at;3079", - "German - Liechtenstein;de-li;5127", - "German - Luxembourg;de-lu;4103", - "German - Switzerland;de-ch;2055", - "Greek;el;1032", - "Hebrew;he;1037", - "Hindi;hi;1081", - "Hungarian;hu;1038", - "Icelandic;is;1039", - "Indonesian;id;1057", - "Italian - Italy;it-it;1040", - "Italian - Switzerland;it-ch;2064", - "Japanese;ja;1041", - "Korean;ko;1042", - "Latvian;lv;1062", - "Lithuanian;lt;1063", - "FYRO Macedonian;mk;1071", - "Malay - Malaysia;ms-my;1086", - "Malay - Brunei;ms-bn;2110", - "Maltese;mt;1082", - "Marathi;mr;1102", - "Norwegian - Bokm?l;no-no;1044", - "Norwegian - Nynorsk;no-no;2068", - "Polish;pl;1045", - "Portuguese - Portugal;pt-pt;2070", - "Portuguese - Brazil;pt-br;1046", - "Raeto-Romance;rm;1047", - "Romanian - Romania;ro;1048", - "Romanian - Moldova;ro-mo;2072", - "Russian;ru;1049", - "Russian - Moldova;ru-mo;2073", - "Sanskrit;sa;1103", - "Serbian - Cyrillic;sr-sp;3098", - "Serbian - Latin;sr-sp;2074", - "Setsuana;tn;1074", - "Slovenian;sl;1060", - "Slovak;sk;1051", - "Sorbian;sb;1070", - "Spanish - Spain;es-es;3082", - "Spanish - Argentina;es-ar;11274", - "Spanish - Bolivia;es-bo;16394", - "Spanish - Chile;es-cl;13322", - "Spanish - Colombia;es-co;9226", - "Spanish - Costa Rica;es-cr;5130", - "Spanish - Dominican Republic;es-do;7178", - "Spanish - Ecuador;es-ec;12298", - "Spanish - Guatemala;es-gt;4106", - "Spanish - Honduras;es-hn;18442", - "Spanish - Mexico;es-mx;2058", - "Spanish - Nicaragua;es-ni;19466", - "Spanish - Panama;es-pa;6154", - "Spanish - Peru;es-pe;10250", - "Spanish - Puerto Rico;es-pr;20490", - "Spanish - Paraguay;es-py;15370", - "Spanish - El Salvador;es-sv;17418", - "Spanish - Uruguay;es-uy;14346", - "Spanish - Venezuela;es-ve;8202", - "Sutu;sx;1072", - "Swahili;sw;1089", - "Swedish - Sweden;sv-se;1053", - "Swedish - Finland;sv-fi;2077", - "Tamil;ta;1097", - "Tatar;tt;1092", - "Thai;th;1054", - "Turkish;tr;1055", - "Tsonga;ts;1073", - "Ukrainian;uk;1058", - "Urdu;ur;1056", - "Uzbek - Cyrillic;uz-uz;2115", - "Uzbek - Latin;uz-uz;1091", - "Vietnamese;vi;1066", - "Xhosa;xh;1076", - "Yiddish;yi;1085", - "Zulu;zu;1077", - "Khmer;km-kh;1107", - "Burmese;my-mm;1109") - return Ids |