diff options
10 files changed, 46 insertions, 17 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu index 8841c4f29f..1cb1e81623 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu @@ -105,15 +105,6 @@ <value>1</value> </prop> </node> - <node oor:name=".uno:ToggleAxisTitle" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - - <value xml:lang="en-US">AxesTitle On/Off</value> - </prop> - <prop oor:name="Properties" oor:type="xs:int"> - <value>1</value> - </prop> - </node> <node oor:name=".uno:ToggleAxisDescr" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> diff --git a/svx/source/cui/paragrph.cxx b/svx/source/cui/paragrph.cxx index 97e4406d69..2275e0d8fe 100644 --- a/svx/source/cui/paragrph.cxx +++ b/svx/source/cui/paragrph.cxx @@ -2356,7 +2356,7 @@ void lcl_SetBox(const SfxItemSet& rSet, USHORT nSlotId, TriStateBox& rBox) { USHORT _nWhich = rSet.GetPool()->GetWhich(nSlotId); SfxItemState eState = rSet.GetItemState(_nWhich, TRUE); - if(!eState) + if(!eState || eState == SFX_ITEM_DISABLED ) rBox.Enable(FALSE); else if(eState >= SFX_ITEM_AVAILABLE) { diff --git a/svx/source/svdraw/ActionDescriptionProvider.cxx b/svx/source/svdraw/ActionDescriptionProvider.cxx index e1773bc68e..0e92b9dd0f 100644 --- a/svx/source/svdraw/ActionDescriptionProvider.cxx +++ b/svx/source/svdraw/ActionDescriptionProvider.cxx @@ -80,6 +80,6 @@ XubString aStr(ImpGetResStr(nResID)); XubString aName(rObjectName); - aStr.SearchAndReplaceAscii("%O", aName); + aStr.SearchAndReplaceAscii("%1", aName); return rtl::OUString(aStr); } diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index da4e05b992..a14e771dba 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -983,7 +983,7 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) XubString aStr2(ImpGetResStr(STR_EditDelete)); // UNICODE: Punkt von ... loeschen - aStr2.SearchAndReplaceAscii("%O", aStr); + aStr2.SearchAndReplaceAscii("%1", aStr); return aStr2; } diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc index 62bb668ed9..7ebd1a2c23 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc @@ -32,7 +32,7 @@ #include "resids.hrc" #include "buttongroup.hrc" -#include "chinese_direction.hrc" +#include "chinese_direction_ids.hrc" #define ED_TERM 1 #define ED_MAPPING 2 diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src index e2229c834c..458e7af3f6 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src @@ -29,6 +29,7 @@ ************************************************************************/ #include "chinese_dictionarydialog.hrc" +#include "chinese_direction.hrc" #ifndef _SVT_CONTROLDIMS_HRC_ #include <svtools/controldims.hrc> diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc new file mode 100644 index 0000000000..3d03100a37 --- /dev/null +++ b/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc @@ -0,0 +1,37 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: chinese_direction_ids.hrc,v $ + * $Revision: 1.1 $ + * + * 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 _TEXTCONVERSIONDLGS_CHINESE_DIRECTION_IDS_HXX +#define _TEXTCONVERSIONDLGS_CHINESE_DIRECTION_IDS_HXX + +#define RB_TO_SIMPLIFIED 1 +#define RB_TO_TRADITIONAL 2 + +#endif diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc index fb8ca8245b..a03204825a 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc +++ b/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc @@ -31,13 +31,12 @@ #ifndef _TEXTCONVERSIONDLGS_CHINESE_DIRECTION_HRC #define _TEXTCONVERSIONDLGS_CHINESE_DIRECTION_HRC +#include "chinese_direction_ids.hrc" + #ifndef _SVT_CONTROLDIMS_HRC_ #include <svtools/controldims.hrc> #endif -#define RB_TO_SIMPLIFIED 1 -#define RB_TO_TRADITIONAL 2 - #define DIRECTION_RADIOBUTTONS( D_XPOS, D_YPOS, D_FULLWIDTH ) \ RadioButton RB_TO_SIMPLIFIED \ { \ diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc index 2ad5bf351f..3882012839 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc @@ -32,7 +32,7 @@ #include "resids.hrc" #include "buttongroup.hrc" -#include "chinese_direction.hrc" +#include "chinese_direction_ids.hrc" #define PB_EDITTERMS 1 diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src index 5c447c513f..9bd251bcb4 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src @@ -29,6 +29,7 @@ ************************************************************************/ #include "chinese_translationdialog.hrc" +#include "chinese_direction.hrc" #ifndef _SVT_CONTROLDIMS_HRC_ #include <svtools/controldims.hrc> |