svx/source/svdraw/svdibrow.cxx | 127 +++++++-------- sw/AllLangResTarget_sw.mk | 1 sw/UIConfig_swriter.mk | 1 sw/inc/globals.hrc | 1 sw/inc/helpid.h | 4 sw/source/ui/chrdlg/ccoll.cxx | 1 sw/source/ui/chrdlg/ccoll.hrc | 43 ----- sw/source/ui/chrdlg/ccoll.src | 157 ------------------ sw/source/ui/chrdlg/swuiccoll.cxx | 178 ++++++++++----------- sw/source/ui/inc/swuiccoll.hxx | 22 +- sw/uiconfig/swriter/ui/conditionpage.ui | 266 ++++++++++++++++++++++++++++++++ 11 files changed, 427 insertions(+), 374 deletions(-)
New commits: commit 6243704ca068a9c2e3ae4c743bdf98630eb831e8 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Aug 23 11:01:35 2013 +0100 convert condition page to .ui Change-Id: Ifd05bdb46cd0cbbce09bd91a3fbf78d6eac0d8c5 diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index 14cbfdd..5305e4d 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -67,7 +67,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\ sw/source/ui/app/app.src \ sw/source/ui/app/error.src \ sw/source/ui/app/mn.src \ - sw/source/ui/chrdlg/ccoll.src \ sw/source/ui/chrdlg/chrdlg.src \ sw/source/ui/config/mailconfigpage.src \ sw/source/ui/config/optcomp.src \ diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index 8dfb01a..9daa0a3 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -76,6 +76,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/columndialog \ sw/uiconfig/swriter/ui/columnpage \ sw/uiconfig/swriter/ui/columnwidth \ + sw/uiconfig/swriter/ui/conditionpage \ sw/uiconfig/swriter/ui/converttexttable \ sw/uiconfig/swriter/ui/createauthorentry \ sw/uiconfig/swriter/ui/createautomarkdialog \ diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc index a65c7b5..122514e 100644 --- a/sw/inc/globals.hrc +++ b/sw/inc/globals.hrc @@ -129,7 +129,6 @@ #define TP_CONTENT_OPT (RC_GLOBALS_BEGIN + 45) #define TP_STD_FONT (RC_GLOBALS_BEGIN + 47) -#define TP_CONDCOLL (RC_GLOBALS_BEGIN + 48) #define TP_NUMBER (RC_GLOBALS_BEGIN + 57) diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index 8fc895a..e8c86d2 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -136,8 +136,6 @@ // TabPage Help-IDs -#define HID_COND_COLL "SW_HID_COND_COLL" - #define HID_REDLINE_CTRL "SW_HID_REDLINE_CTRL" #define HID_OPTCAPTION_PAGE "SW_HID_OPTCAPTION_PAGE" #define HID_TP_TOX_SELECT "SW_HID_TP_TOX_SELECT" @@ -307,8 +305,6 @@ #define HID_CALC_TOOLBOX "SW_HID_CALC_TOOLBOX" #define HID_PVIEW_TOOLBOX "SW_HID_PVIEW_TOOLBOX" -#define HID_COND_COLL_TABLIST "SW_HID_COND_COLL_TABLIST" - #define HID_SELECT_TEMPLATE "SW_HID_SELECT_TEMPLATE" #define HID_AP_INSERT_DB_SEL "SW_HID_AP_INSERT_DB_SEL" diff --git a/sw/source/ui/chrdlg/ccoll.cxx b/sw/source/ui/chrdlg/ccoll.cxx index 7968527..4039495 100644 --- a/sw/source/ui/chrdlg/ccoll.cxx +++ b/sw/source/ui/chrdlg/ccoll.cxx @@ -36,7 +36,6 @@ #include "hints.hxx" #include "chrdlg.hrc" -#include "ccoll.hrc" #include <vcl/svapp.hxx> #include <unomid.h> diff --git a/sw/source/ui/chrdlg/ccoll.hrc b/sw/source/ui/chrdlg/ccoll.hrc deleted file mode 100644 index 605fc8e..0000000 --- a/sw/source/ui/chrdlg/ccoll.hrc +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#ifndef _CCOLL_HRC -#define _CCOLL_HRC - -// #define ****************************************************************** - -#define CB_CONDITION 1 -#define FL_CONDITION 2 -#define FT_CONTEXT 3 -#define FT_USED 4 -#define TB_CONDCOLLS 5 -#define FT_STYLE 6 -#define LB_STYLE 7 -#define LB_FILTER 8 -#define PB_REMOVE 9 -#define PB_ASSIGN 10 -#define STR_REGIONS 11 -#define STR_NOTEMPL 12 - - -// ********************************************************************** EOF - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/chrdlg/ccoll.src b/sw/source/ui/chrdlg/ccoll.src deleted file mode 100644 index 8c78cc7..0000000 --- a/sw/source/ui/chrdlg/ccoll.src +++ /dev/null @@ -1,157 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#include "globals.hrc" -#include "chrdlg.hrc" -#include "ccoll.hrc" -#include "helpid.h" - // TabPage ****************************************************************** -TabPage TP_CONDCOLL -{ - HelpID = HID_COND_COLL ; - Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; - Hide = TRUE ; - FixedLine FL_CONDITION - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 248 , 8 ) ; - Text [ en-US ] = "Options"; - }; - CheckBox CB_CONDITION - { - HelpID = "sw:CheckBox:TP_CONDCOLL:CB_CONDITION"; - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 100 , 10 ) ; - TabStop = TRUE ; - Disable = TRUE ; - Text [ en-US ] = "~Conditional Style" ; - }; - FixedText FT_CONTEXT - { - Pos = MAP_APPFONT ( 12 , 28 ) ; - Size = MAP_APPFONT ( 50 , 8 ) ; - Disable = TRUE ; - Text [ en-US ] = "Conte~xt" ; - }; - FixedText FT_USED - { - Pos = MAP_APPFONT ( 100 , 28 ) ; - Size = MAP_APPFONT ( 80 , 8 ) ; - Disable = TRUE ; - Text [ en-US ] = "Applied Styles" ; - }; - Control TB_CONDCOLLS - { - Border = TRUE ; - Pos = MAP_APPFONT ( 12 , 39 ) ; - Size = MAP_APPFONT ( 173 , 123 ) ; - TabStop = TRUE ; - ClipChildren = TRUE ; - Disable = TRUE ; - Border = TRUE ; - }; - FixedText FT_STYLE - { - Pos = MAP_APPFONT ( 190 , 28 ) ; - Size = MAP_APPFONT ( 58 , 8 ) ; - Disable = TRUE ; - Text [ en-US ] = "~Paragraph Styles" ; - }; - ListBox LB_STYLE - { - HelpID = "sw:ListBox:TP_CONDCOLL:LB_STYLE"; - Pos = MAP_APPFONT ( 188 , 39 ) ; - Size = MAP_APPFONT ( 60 , 108 ) ; - TabStop = TRUE ; - Border = TRUE ; - Sort = TRUE ; - Disable = TRUE ; - HScroll = TRUE ; - }; - ListBox LB_FILTER - { - HelpID = "sw:ListBox:TP_CONDCOLL:LB_FILTER"; - Pos = MAP_APPFONT ( 188 , 150 ) ; - Size = MAP_APPFONT ( 60 , 50 ) ; - DropDown = TRUE ; - TabStop = TRUE ; - Border = TRUE ; - Disable = TRUE ; - HScroll = TRUE ; - }; - PushButton PB_REMOVE - { - HelpID = "sw:PushButton:TP_CONDCOLL:PB_REMOVE"; - Pos = MAP_APPFONT ( 129 , 165 ) ; - Size = MAP_APPFONT ( 50 , 12 ) ; - TabStop = TRUE ; - Disable = TRUE ; - Text [ en-US ] = "Re~move" ; - }; - PushButton PB_ASSIGN - { - HelpID = "sw:PushButton:TP_CONDCOLL:PB_ASSIGN"; - Pos = MAP_APPFONT ( 185 , 165 ) ; - Size = MAP_APPFONT ( 50 , 12 ) ; - TabStop = TRUE ; - Disable = TRUE ; - Text [ en-US ] = "~Apply" ; - }; - StringArray STR_REGIONS - { - ItemList [ en-US ] = - { - < "Table Header" ; > ; - < "Table" ; > ; - < "Frame" ; > ; - < "Section" ; > ; - < "Footnote" ; > ; - < "Endnote" ; > ; - < "Header" ; > ; - < "Footer" ; > ; - < " 1st Outline Level" ; > ; - < " 2nd Outline Level" ; > ; - < " 3rd Outline Level" ; > ; - < " 4th Outline Level" ; > ; - < " 5th Outline Level" ; > ; - < " 6th Outline Level" ; > ; - < " 7th Outline Level" ; > ; - < " 8th Outline Level" ; > ; - < " 9th Outline Level" ; > ; - < "10th Outline Level" ; > ; - < " 1st Numbering Level" ; > ; - < " 2nd Numbering Level" ; > ; - < " 3rd Numbering Level" ; > ; - < " 4th Numbering Level" ; > ; - < " 5th Numbering Level" ; > ; - < " 6th Numbering Level" ; > ; - < " 7th Numbering Level" ; > ; - < " 8th Numbering Level" ; > ; - < " 9th Numbering Level" ; > ; - < "10th Numbering Level" ; > ; - }; - }; - String STR_NOTEMPL - { - Text [ en-US ] = "<none>" ; - }; -}; - // ********************************************************************** EOF - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 994ccb2..6a85de8 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -35,7 +35,6 @@ #include "hints.hxx" #include "chrdlg.hrc" -#include "ccoll.hrc" #include <vcl/svapp.hxx> #include "swuiccoll.hxx" @@ -52,49 +51,50 @@ static long nTabs[] = }; SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet) - - : SfxTabPage(pParent, SW_RES(TP_CONDCOLL), rSet), - aConditionFL( this, SW_RES( FL_CONDITION )), - aConditionCB( this, SW_RES( CB_CONDITION ) ), - aContextFT ( this, SW_RES( FT_CONTEXT ) ), - aUsedFT ( this, SW_RES( FT_USED ) ), - aTbLinks( this, SW_RES( TB_CONDCOLLS ) ), - aStyleFT ( this, SW_RES( FT_STYLE ) ), - aStyleLB ( this, SW_RES( LB_STYLE ) ), - aFilterLB ( this, SW_RES( LB_FILTER ) ), - aRemovePB ( this, SW_RES( PB_REMOVE ) ), - aAssignPB ( this, SW_RES( PB_ASSIGN ) ), - sNoTmpl ( SW_RES( STR_NOTEMPL ) ), - aStrArr ( SW_RES( STR_REGIONS ) ), + : SfxTabPage(pParent, "ConditionPage", + "modules/swriter/ui/conditionpage.ui", rSet) + , rSh(::GetActiveView()->GetWrtShell()), pCmds( SwCondCollItem::GetCmds() ), pFmt(0), bNewTemplate(sal_False) { - FreeResource(); - SetExchangeSupport(); + get(m_pConditionCB, "condstyle"); + get(m_pContextFT, "contextft"); + get(m_pUsedFT, "usedft"); + get(m_pStyleFT, "styleft"); + get(m_pTbLinks, "links"); + get(m_pStyleLB, "styles"); + m_pStyleLB->SetStyle(m_pStyleLB->GetStyle() | WB_SORT); + m_pStyleLB->SetDropDownLineCount(12); + m_pTbLinks->set_height_request(m_pStyleLB->GetOptimalSize().Height()); + get(m_pFilterLB, "filter"); + get(m_pRemovePB, "remove"); + get(m_pAssignPB, "apply"); + + sal_uInt16 nStrCount = m_pFilterLB->GetEntryCount(); + for (sal_uInt16 i = 0; i < nStrCount; ++i) + m_aStrArr.push_back(m_pFilterLB->GetEntry(i)); + m_pFilterLB->Clear(); - aRemovePB.SetAccessibleRelationMemberOf(&aConditionFL); - aAssignPB.SetAccessibleRelationMemberOf(&aConditionFL); - aTbLinks.SetAccessibleRelationLabeledBy(&aConditionCB); + SetExchangeSupport(); // Install handlers - aConditionCB.SetClickHdl( LINK(this, SwCondCollPage, OnOffHdl)); - aTbLinks.SetDoubleClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); - aStyleLB.SetDoubleClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); - aRemovePB.SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); - aAssignPB.SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); - aTbLinks.SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl)); - aStyleLB.SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl)); - aFilterLB.SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl)); - - aTbLinks.SetStyle(aTbLinks.GetStyle()|WB_HSCROLL|WB_CLIPCHILDREN); - aTbLinks.SetSelectionMode( SINGLE_SELECTION ); - aTbLinks.SetTabs( &nTabs[0], MAP_APPFONT ); - aTbLinks.Resize(); // OS: Hack for the right selection - aTbLinks.SetSpaceBetweenEntries( 0 ); - aTbLinks.SetHelpId(HID_COND_COLL_TABLIST); + m_pConditionCB->SetClickHdl( LINK(this, SwCondCollPage, OnOffHdl)); + m_pTbLinks->SetDoubleClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); + m_pStyleLB->SetDoubleClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); + m_pRemovePB->SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); + m_pAssignPB->SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); + m_pTbLinks->SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl)); + m_pStyleLB->SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl)); + m_pFilterLB->SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl)); + + m_pTbLinks->SetStyle(m_pTbLinks->GetStyle()|WB_HSCROLL|WB_CLIPCHILDREN); + m_pTbLinks->SetSelectionMode( SINGLE_SELECTION ); + m_pTbLinks->SetTabs( &nTabs[0], MAP_APPFONT ); + m_pTbLinks->Resize(); // OS: Hack for the right selection + m_pTbLinks->SetSpaceBetweenEntries( 0 ); SfxStyleFamilies aFamilies(SW_RES(DLG_STYLE_DESIGNER)); const SfxStyleFamilyItem* pFamilyItem = 0; @@ -109,13 +109,13 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet) const SfxStyleFilter& rFilterList = pFamilyItem->GetFilterList(); for( size_t i = 0; i < rFilterList.size(); ++i ) { - aFilterLB.InsertEntry( rFilterList[ i ]->aName); + m_pFilterLB->InsertEntry( rFilterList[ i ]->aName); sal_uInt16* pFilter = new sal_uInt16(rFilterList[i]->nFlags); - aFilterLB.SetEntryData(i, pFilter); + m_pFilterLB->SetEntryData(i, pFilter); } - aFilterLB.SelectEntryPos(1); + m_pFilterLB->SelectEntryPos(1); - aTbLinks.Show(); + m_pTbLinks->Show(); } @@ -126,8 +126,8 @@ Page: Dtor SwCondCollPage::~SwCondCollPage() { - for(sal_uInt16 i = 0; i < aFilterLB.GetEntryCount(); ++i) - delete (sal_uInt16*)aFilterLB.GetEntryData(i); + for(sal_uInt16 i = 0; i < m_pFilterLB->GetEntryCount(); ++i) + delete (sal_uInt16*)m_pFilterLB->GetEntryData(i); } @@ -159,9 +159,9 @@ sal_Bool SwCondCollPage::FillItemSet(SfxItemSet &rSet) { sal_Bool bModified = sal_True; SwCondCollItem aCondItem; - for(sal_uInt16 i = 0; i < aStrArr.Count(); i++) + for (size_t i = 0; i < m_aStrArr.size(); ++i) { - OUString sEntry = aTbLinks.GetEntryText(i, 1); + OUString sEntry = m_pTbLinks->GetEntryText(i, 1); aCondItem.SetStyle( &sEntry, i); } rSet.Put(aCondItem); @@ -176,28 +176,28 @@ Page: Reset-Overload void SwCondCollPage::Reset(const SfxItemSet &/*rSet*/) { if(bNewTemplate) - aConditionCB.Enable(); + m_pConditionCB->Enable(); if(RES_CONDTXTFMTCOLL == pFmt->Which()) - aConditionCB.Check(); - OnOffHdl(&aConditionCB); + m_pConditionCB->Check(); + OnOffHdl(m_pConditionCB); - aTbLinks.Clear(); + m_pTbLinks->Clear(); SfxStyleSheetBasePool* pPool = rSh.GetView().GetDocShell()->GetStyleSheetPool(); pPool->SetSearchMask(SFX_STYLE_FAMILY_PARA, SFXSTYLEBIT_ALL); - aStyleLB.Clear(); + m_pStyleLB->Clear(); const SfxStyleSheetBase* pBase = pPool->First(); while( pBase ) { if(!pFmt || pBase->GetName() != pFmt->GetName()) - aStyleLB.InsertEntry(pBase->GetName()); + m_pStyleLB->InsertEntry(pBase->GetName()); pBase = pPool->Next(); } - aStyleLB.SelectEntryPos(0); + m_pStyleLB->SelectEntryPos(0); - for( sal_uInt16 n = 0; n < aStrArr.Count(); n++) + for (size_t n = 0; n < m_aStrArr.size(); ++n) { - OUString aEntry( aStrArr.GetString(n) + "\t" ); + OUString aEntry( m_aStrArr[n] + "\t" ); const SwCollCondition* pCond = 0; if( pFmt && RES_CONDTXTFMTCOLL == pFmt->Which() && @@ -208,9 +208,9 @@ void SwCondCollPage::Reset(const SfxItemSet &/*rSet*/) aEntry += pCond->GetTxtFmtColl()->GetName(); } - SvTreeListEntry* pE = aTbLinks.InsertEntryToColumn( aEntry, n ); + SvTreeListEntry* pE = m_pTbLinks->InsertEntryToColumn( aEntry, n ); if(0 == n) - aTbLinks.Select(pE); + m_pTbLinks->Select(pE); } } @@ -223,14 +223,14 @@ sal_uInt16* SwCondCollPage::GetRanges() IMPL_LINK( SwCondCollPage, OnOffHdl, CheckBox*, pBox ) { const sal_Bool bEnable = pBox->IsChecked(); - aContextFT.Enable( bEnable ); - aUsedFT .Enable( bEnable ); - aTbLinks .EnableList( bEnable != sal_False ); - aStyleFT .Enable( bEnable ); - aStyleLB .Enable( bEnable ); - aFilterLB .Enable( bEnable ); - aRemovePB .Enable( bEnable ); - aAssignPB .Enable( bEnable ); + m_pContextFT->Enable( bEnable ); + m_pUsedFT->Enable( bEnable ); + m_pTbLinks->EnableList( bEnable != sal_False ); + m_pStyleFT->Enable( bEnable ); + m_pStyleLB->Enable( bEnable ); + m_pFilterLB->Enable( bEnable ); + m_pRemovePB->Enable( bEnable ); + m_pAssignPB->Enable( bEnable ); if( bEnable ) SelectHdl(0); return 0; @@ -238,40 +238,40 @@ IMPL_LINK( SwCondCollPage, OnOffHdl, CheckBox*, pBox ) IMPL_LINK( SwCondCollPage, AssignRemoveHdl, PushButton*, pBtn) { - SvTreeListEntry* pE = aTbLinks.FirstSelected(); + SvTreeListEntry* pE = m_pTbLinks->FirstSelected(); sal_uLong nPos; if( !pE || LISTBOX_ENTRY_NOTFOUND == - ( nPos = aTbLinks.GetModel()->GetAbsPos( pE ) ) ) + ( nPos = m_pTbLinks->GetModel()->GetAbsPos( pE ) ) ) { OSL_ENSURE( pE, "where's the empty entry from?" ); return 0; } - String sSel = aStrArr.GetString( sal_uInt16(nPos) ); - sSel += '\t'; + OUString sSel = m_aStrArr[nPos]; + sSel += "\t"; - const sal_Bool bAssEnabled = pBtn != &aRemovePB && aAssignPB.IsEnabled(); - aAssignPB.Enable( !bAssEnabled ); - aRemovePB.Enable( bAssEnabled ); + const sal_Bool bAssEnabled = pBtn != m_pRemovePB && m_pAssignPB->IsEnabled(); + m_pAssignPB->Enable( !bAssEnabled ); + m_pRemovePB->Enable( bAssEnabled ); if ( bAssEnabled ) - sSel += aStyleLB.GetSelectEntry(); - - aTbLinks.SetUpdateMode(sal_False); - aTbLinks.GetModel()->Remove(pE); - pE = aTbLinks.InsertEntryToColumn(sSel, nPos); - aTbLinks.Select(pE); - aTbLinks.MakeVisible(pE); - aTbLinks.SetUpdateMode(sal_True); + sSel += m_pStyleLB->GetSelectEntry(); + + m_pTbLinks->SetUpdateMode(sal_False); + m_pTbLinks->GetModel()->Remove(pE); + pE = m_pTbLinks->InsertEntryToColumn(sSel, nPos); + m_pTbLinks->Select(pE); + m_pTbLinks->MakeVisible(pE); + m_pTbLinks->SetUpdateMode(sal_True); return 0; } IMPL_LINK( SwCondCollPage, SelectHdl, ListBox*, pBox) { - if(pBox == &aFilterLB) + if (pBox == m_pFilterLB) { - aStyleLB.Clear(); + m_pStyleLB->Clear(); sal_uInt16 nSearchFlags = pBox->GetSelectEntryPos(); - nSearchFlags = *(sal_uInt16*)aFilterLB.GetEntryData(nSearchFlags); + nSearchFlags = *(sal_uInt16*)m_pFilterLB->GetEntryData(nSearchFlags); SfxStyleSheetBasePool* pPool = rSh.GetView().GetDocShell()->GetStyleSheetPool(); pPool->SetSearchMask(SFX_STYLE_FAMILY_PARA, nSearchFlags); const SfxStyleSheetBase* pBase = pPool->First(); @@ -279,26 +279,26 @@ IMPL_LINK( SwCondCollPage, SelectHdl, ListBox*, pBox) while( pBase ) { if(!pFmt || pBase->GetName() != pFmt->GetName()) - aStyleLB.InsertEntry(pBase->GetName()); + m_pStyleLB->InsertEntry(pBase->GetName()); pBase = pPool->Next(); } - aStyleLB.SelectEntryPos(0); - SelectHdl(&aStyleLB); + m_pStyleLB->SelectEntryPos(0); + SelectHdl(m_pStyleLB); } else { String sTbEntry; - SvTreeListEntry* pE = aTbLinks.FirstSelected(); + SvTreeListEntry* pE = m_pTbLinks->FirstSelected(); if(pE) - sTbEntry = aTbLinks.GetEntryText(pE); + sTbEntry = m_pTbLinks->GetEntryText(pE); sTbEntry = sTbEntry.GetToken(1, '\t'); - String sStyle = aStyleLB.GetSelectEntry(); + String sStyle = m_pStyleLB->GetSelectEntry(); - aAssignPB.Enable( sStyle != sTbEntry && aConditionCB.IsChecked() ); + m_pAssignPB->Enable( sStyle != sTbEntry && m_pConditionCB->IsChecked() ); - if(pBox != &aStyleLB) - aRemovePB.Enable( aConditionCB.IsChecked() && sTbEntry.Len() ); + if(pBox != m_pStyleLB) + m_pRemovePB->Enable( m_pConditionCB->IsChecked() && sTbEntry.Len() ); } return 0; } diff --git a/sw/source/ui/inc/swuiccoll.hxx b/sw/source/ui/inc/swuiccoll.hxx index 58d920d..56113de 100644 --- a/sw/source/ui/inc/swuiccoll.hxx +++ b/sw/source/ui/inc/swuiccoll.hxx @@ -26,22 +26,20 @@ class SwFmt; class SwCondCollPage : public SfxTabPage { - FixedLine aConditionFL; - CheckBox aConditionCB; + CheckBox* m_pConditionCB; - FixedText aContextFT; - FixedText aUsedFT; - SvTabListBox aTbLinks; + FixedText* m_pContextFT; + FixedText* m_pUsedFT; + SvTabListBox* m_pTbLinks; - FixedText aStyleFT; - ListBox aStyleLB; - ListBox aFilterLB; + FixedText* m_pStyleFT; + ListBox* m_pStyleLB; + ListBox* m_pFilterLB; - PushButton aRemovePB; - PushButton aAssignPB; + PushButton* m_pRemovePB; + PushButton* m_pAssignPB; - String sNoTmpl; - ResStringArray aStrArr; + std::vector<OUString> m_aStrArr; SwWrtShell &rSh; const CommandStruct*pCmds; diff --git a/sw/uiconfig/swriter/ui/conditionpage.ui b/sw/uiconfig/swriter/ui/conditionpage.ui new file mode 100644 index 0000000..f357c89 --- /dev/null +++ b/sw/uiconfig/swriter/ui/conditionpage.ui @@ -0,0 +1,266 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <!-- interface-requires LibreOffice 1.0 --> + <object class="GtkGrid" id="ConditionPage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="border_width">6</property> + <property name="row_spacing">18</property> + <child> + <object class="GtkFrame" id="frame4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="column_homogeneous">True</property> + <child> + <object class="GtkCheckButton" id="condstyle"> + <property name="label" translatable="yes">_Conditional Style</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <accessibility> + <relation type="label-for" target="links:border"/> + </accessibility> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">3</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="contextft"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Conte_xt</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="usedft"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Applied Styles</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="styleft"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_Paragraph Styles</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="svtlo-SvTabListBox" id="links:border"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <accessibility> + <relation type="labelled-by" target="condstyle"/> + </accessibility> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="Tab List-selection1"/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">2</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkButtonBox" id="buttonbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="spacing">12</property> + <property name="layout_style">start</property> + <child> + <object class="GtkButton" id="remove"> + <property name="label">gtk-remove</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="apply"> + <property name="label">gtk-apply</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">3</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkTreeView" id="styles:border"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="filter"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="entry_text_column">0</property> + <property name="id_column">1</property> + <items> + <item translatable="yes">Table Header</item> + <item translatable="yes">Table</item> + <item translatable="yes">Frame</item> + <item translatable="yes">Section</item> + <item translatable="yes">Footnote</item> + <item translatable="yes">Endnote</item> + <item translatable="yes">Header</item> + <item translatable="yes">Footer</item> + <item translatable="yes"> 1st Outline Level</item> + <item translatable="yes"> 2nd Outline Level</item> + <item translatable="yes"> 3rd Outline Level</item> + <item translatable="yes"> 4th Outline Level</item> + <item translatable="yes"> 5th Outline Level</item> + <item translatable="yes"> 6th Outline Level</item> + <item translatable="yes"> 7th Outline Level</item> + <item translatable="yes"> 8th Outline Level</item> + <item translatable="yes"> 9th Outline Level</item> + <item translatable="yes">10th Outline Level</item> + <item translatable="yes"> 1st Numbering Level</item> + <item translatable="yes"> 2nd Numbering Level</item> + <item translatable="yes"> 3rd Numbering Level</item> + <item translatable="yes"> 4th Numbering Level</item> + <item translatable="yes"> 5th Numbering Level</item> + <item translatable="yes"> 6th Numbering Level</item> + <item translatable="yes"> 7th Numbering Level</item> + <item translatable="yes"> 8th Numbering Level</item> + <item translatable="yes"> 9th Numbering Level</item> + <item translatable="yes">10th Numbering Level</item> + </items> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Options</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> +</interface> commit 209ca76f0eacce10378bdc44e41e7cb69bd612e0 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Aug 23 10:08:56 2013 +0100 XubString->OUString and German->English and remove the use of the current environment encoding, which can only match the encoding of the text by chance Change-Id: Iff6027a8d91db3644c9b827fb9460728c2b61751 diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 4118b8e..68c5663 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -105,41 +105,39 @@ public: bCanNum(false) {} - XubString GetItemTypeStr() const; + OUString GetItemTypeStr() const; bool operator==(const ImpItemListRow& rEntry) const; bool operator!=(const ImpItemListRow& rEntry) const { return !operator==(rEntry); } }; -XubString ImpItemListRow::GetItemTypeStr() const +OUString ImpItemListRow::GetItemTypeStr() const { - XubString aStr; - switch(eItemType) { - case ITEM_BYTE : aStr.AppendAscii("Byte"); break; - case ITEM_INT16 : aStr.AppendAscii("Int16"); break; - case ITEM_UINT16 : aStr.AppendAscii("UInt16"); break; - case ITEM_INT32 : aStr.AppendAscii("Int32"); break; - case ITEM_UINT32 : aStr.AppendAscii("UInt32"); break; - case ITEM_ENUM : aStr.AppendAscii("Enum"); break; - case ITEM_BOOL : aStr.AppendAscii("Bool"); break; - case ITEM_FLAG : aStr.AppendAscii("Flag"); break; - case ITEM_STRING : aStr.AppendAscii("String"); break; - case ITEM_POINT : aStr.AppendAscii("Point"); break; - case ITEM_RECT : aStr.AppendAscii("Rectangle");break; - case ITEM_RANGE : aStr.AppendAscii("Range"); break; - case ITEM_LRANGE : aStr.AppendAscii("LRange"); break; - case ITEM_FRACTION : aStr.AppendAscii("Fraction"); break; - case ITEM_XCOLOR : aStr.AppendAscii("XColor"); break; - case ITEM_COLOR : aStr.AppendAscii("Color"); break; - case ITEM_FONT : aStr.AppendAscii("Font"); break; - case ITEM_FONTHEIGHT:aStr.AppendAscii("FontHeight");break; - case ITEM_FONTWIDTH :aStr.AppendAscii("FontWidth"); break; - case ITEM_FIELD :aStr.AppendAscii("Field"); break; + case ITEM_BYTE : return OUString("Byte"); break; + case ITEM_INT16 : return OUString("Int16"); break; + case ITEM_UINT16 : return OUString("UInt16"); break; + case ITEM_INT32 : return OUString("Int32"); break; + case ITEM_UINT32 : return OUString("UInt32"); break; + case ITEM_ENUM : return OUString("Enum"); break; + case ITEM_BOOL : return OUString("Bool"); break; + case ITEM_FLAG : return OUString("Flag"); break; + case ITEM_STRING : return OUString("String"); break; + case ITEM_POINT : return OUString("Point"); break; + case ITEM_RECT : return OUString("Rectangle");break; + case ITEM_RANGE : return OUString("Range"); break; + case ITEM_LRANGE : return OUString("LRange"); break; + case ITEM_FRACTION : return OUString("Fraction"); break; + case ITEM_XCOLOR : return OUString("XColor"); break; + case ITEM_COLOR : return OUString("Color"); break; + case ITEM_FONT : return OUString("Font"); break; + case ITEM_FONTHEIGHT: return OUString("FontHeight");break; + case ITEM_FONTWIDTH : return OUString("FontWidth"); break; + case ITEM_FIELD : return OUString("Field"); break; default: break; } - return aStr; + return OUString(); } bool ImpItemListRow::operator==(const ImpItemListRow& rEntry) const @@ -240,29 +238,27 @@ void _SdrItemBrowserControl::ImpCtor() bShowWhichIds = sal_True; // not implemented yet bShowRealValues = sal_True; // not implemented yet - rtl_TextEncoding aTextEncoding = osl_getThreadTextEncoding(); - InsertDataColumn( ITEMBROWSER_WHICHCOL_ID, - String("Which", aTextEncoding), - GetTextWidth(String(" Which ", aTextEncoding)) + 2); + OUString("Which"), + GetTextWidth(OUString(" Which ")) + 2); InsertDataColumn( ITEMBROWSER_STATECOL_ID, - String("State", aTextEncoding), - std::max(GetTextWidth(String(" State ", aTextEncoding)) + 2 , - GetTextWidth(String("DontCare", aTextEncoding)) + 2)); + OUString("State"), + std::max(GetTextWidth(OUString(" State ")) + 2 , + GetTextWidth(OUString("DontCare")) + 2)); InsertDataColumn( ITEMBROWSER_TYPECOL_ID , - String("Type", aTextEncoding), - GetTextWidth(String(" Type_ ", aTextEncoding)) + 2); + OUString("Type"), + GetTextWidth(OUString(" Type_ ")) + 2); InsertDataColumn( ITEMBROWSER_NAMECOL_ID , - String("Name", aTextEncoding), + OUString("Name"), 150); InsertDataColumn( ITEMBROWSER_VALUECOL_ID, - String("Value", aTextEncoding), - GetTextWidth(String("12345678901234567890", aTextEncoding))); + OUString("Value"), + GetTextWidth(OUString("12345678901234567890"))); SetDataRowHeight( GetTextHeight()); @@ -509,16 +505,16 @@ bool _SdrItemBrowserControl::BegChangeEntry(sal_uIntPtr nPos) pEditControl->SetSelection(Selection(SELECTION_MIN,SELECTION_MAX)); Window* pParent=GetParent(); aWNamMerk=pParent->GetText(); - XubString aNeuNam(aWNamMerk); - aNeuNam += sal_Unicode(' '); + OUString aNeuNam(aWNamMerk); + aNeuNam += " "; aNeuNam += pEntry->GetItemTypeStr(); if (pEntry->bCanNum) { - aNeuNam.AppendAscii(": "); + aNeuNam += ": "; aNeuNam += OUString::number(pEntry->nMin); - aNeuNam.AppendAscii(".."); + aNeuNam += ".."; aNeuNam += OUString::number(pEntry->nMax); } - aNeuNam.AppendAscii(" - Type 'del' to reset to default."); + aNeuNam += " - Type 'del' to reset to default."; pParent->SetText(aNeuNam); pAktChangeEntry=new ImpItemListRow(*pEntry); bRet = true; @@ -911,7 +907,6 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem { SetMode(MYBROWSEMODE & ~BROWSER_KEEPHIGHLIGHT); if (pSet!=NULL) { - rtl_TextEncoding aTextEncoding = osl_getThreadTextEncoding(); sal_uInt16 nEntryNum=0; SfxWhichIter aIter(*pSet); const SfxItemPool* pPool=pSet->GetPool(); @@ -932,26 +927,26 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem const SfxPoolItem& rItem=pSet->Get(nWhich); sal_uInt16 nIndent=0; if (!HAS_BASE(SfxVoidItem,&rItem) && !HAS_BASE(SfxSetItem,&rItem) && (!IsItemIneffective(nWhich,pSet,nIndent) || bDontHideIneffectiveItems)) { - XubString aCommentStr; - - INSERTCOMMENT(XATTR_LINE_FIRST,XATTR_LINE_LAST,String("L I N I E", aTextEncoding)); - INSERTCOMMENT(XATTR_FILL_FIRST,XATTR_FILL_LAST,String("F L \357\277\275 C H E", aTextEncoding)); - INSERTCOMMENT(XATTR_TEXT_FIRST,XATTR_TEXT_LAST,String("F O N T W O R K", aTextEncoding)); - INSERTCOMMENT(SDRATTR_SHADOW_FIRST,SDRATTR_SHADOW_LAST,String("S C H A T T E N", aTextEncoding)); - INSERTCOMMENT(SDRATTR_CAPTION_FIRST,SDRATTR_CAPTION_LAST,String("L E G E N D E", aTextEncoding)); - INSERTCOMMENT(SDRATTR_MISC_FIRST,SDRATTR_MISC_LAST,String("V E R S C H I E D E N E S", aTextEncoding)); - INSERTCOMMENT(SDRATTR_EDGE_FIRST,SDRATTR_EDGE_LAST,String("V E R B I N D E R", aTextEncoding)); - INSERTCOMMENT(SDRATTR_MEASURE_FIRST,SDRATTR_MEASURE_LAST,String("B E M A S S U N G", aTextEncoding)); - INSERTCOMMENT(SDRATTR_CIRC_FIRST,SDRATTR_CIRC_LAST,String("K R E I S", aTextEncoding)); - INSERTCOMMENT(SDRATTR_NOTPERSIST_FIRST,SDRATTR_NOTPERSIST_LAST,String("N O T P E R S I S T", aTextEncoding)); - INSERTCOMMENT(SDRATTR_MOVEX,SDRATTR_VERTSHEARONE,String("Transformationen auf alle Objekte einzeln", aTextEncoding)); - INSERTCOMMENT(SDRATTR_RESIZEXALL,SDRATTR_VERTSHEARALL,String("Transformationen auf alle Objekte gemeinsam", aTextEncoding)); - INSERTCOMMENT(SDRATTR_TRANSFORMREF1X,SDRATTR_TRANSFORMREF2Y,String("View-Referenzpunkte", aTextEncoding)); - INSERTCOMMENT(SDRATTR_GRAF_FIRST,SDRATTR_GRAF_LAST,String("G R A F I K", aTextEncoding)); - INSERTCOMMENT(EE_ITEMS_START,EE_ITEMS_END,String("E D I T E N G I N E", aTextEncoding)); - INSERTCOMMENT(EE_ITEMS_END+1,EE_ITEMS_END+1,String("... by Joe Merten, JME Engineering Berlin ...", aTextEncoding)); - - if(aCommentStr.Len()) + OUString aCommentStr; + + INSERTCOMMENT(XATTR_LINE_FIRST,XATTR_LINE_LAST,OUString("L I N E")); + INSERTCOMMENT(XATTR_FILL_FIRST,XATTR_FILL_LAST,OUString("F I L L")); + INSERTCOMMENT(XATTR_TEXT_FIRST,XATTR_TEXT_LAST,OUString("F O N T W O R K")); + INSERTCOMMENT(SDRATTR_SHADOW_FIRST,SDRATTR_SHADOW_LAST,OUString("S H A D O W")); + INSERTCOMMENT(SDRATTR_CAPTION_FIRST,SDRATTR_CAPTION_LAST,OUString("C A P T I O N")); + INSERTCOMMENT(SDRATTR_MISC_FIRST,SDRATTR_MISC_LAST,OUString("M I S C E L L A N E O U S")); + INSERTCOMMENT(SDRATTR_EDGE_FIRST,SDRATTR_EDGE_LAST,OUString("C O N N E C T O R")); + INSERTCOMMENT(SDRATTR_MEASURE_FIRST,SDRATTR_MEASURE_LAST,OUString("D I M E N S I O N")); + INSERTCOMMENT(SDRATTR_CIRC_FIRST,SDRATTR_CIRC_LAST,OUString("C I R C U L A R")); + INSERTCOMMENT(SDRATTR_NOTPERSIST_FIRST,SDRATTR_NOTPERSIST_LAST,OUString("N O T P E R S I S T")); + INSERTCOMMENT(SDRATTR_MOVEX,SDRATTR_VERTSHEARONE,OUString("Transformation of all object individually")); + INSERTCOMMENT(SDRATTR_RESIZEXALL,SDRATTR_VERTSHEARALL,OUString("Transformation of all objects together")); + INSERTCOMMENT(SDRATTR_TRANSFORMREF1X,SDRATTR_TRANSFORMREF2Y,OUString("V I E W R E F E R E N C E P O I N T S")); + INSERTCOMMENT(SDRATTR_GRAF_FIRST,SDRATTR_GRAF_LAST,OUString("G R A P H I C")); + INSERTCOMMENT(EE_ITEMS_START,EE_ITEMS_END,OUString("E D I T E N G I N E")); + INSERTCOMMENT(EE_ITEMS_END+1,EE_ITEMS_END+1,OUString("... by Joe Merten, JME Engineering Berlin ...")); + + if (!aCommentStr.isEmpty()) { ImpItemListRow aEntry; aEntry.bComment = true; @@ -1021,7 +1016,7 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem } else { - aEntry.aValue = String("InvalidItem", aTextEncoding); + aEntry.aValue = OUString("InvalidItem"); } ImpSetEntry(aEntry,nEntryNum); nEntryNum++; @@ -1052,7 +1047,7 @@ _SdrItemBrowserWindow::_SdrItemBrowserWindow(Window* pParent, WinBits nBits): aBrowse(this) { SetOutputSizePixel(aBrowse.GetSizePixel()); - SetText(String("Joe's ItemBrowser", osl_getThreadTextEncoding())); + SetText(OUString("Joe's ItemBrowser")); aBrowse.Show(); } @@ -1227,7 +1222,7 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse) case ITEM_FONT: { ((SvxFontItem*)pNewItem)->SetFamily( FAMILY_DONTKNOW ); ((SvxFontItem*)pNewItem)->SetFamilyName(aNewText); - ((SvxFontItem*)pNewItem)->SetStyleName( String() ); + ((SvxFontItem*)pNewItem)->SetStyleName(OUString()); } break; case ITEM_FONTHEIGHT: { sal_uIntPtr nHgt=0;
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits