[ooo-build-commit] .: cui/source extensions/source
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Mon Oct 4 00:49:39 PDT 2010
cui/source/tabpages/tabarea.cxx | 29 +------
cui/source/tabpages/tpcolor.cxx | 30 +++----
cui/source/tabpages/tpline.cxx | 114 +++--------------------------
extensions/source/propctrlr/fontdialog.cxx | 6 -
4 files changed, 36 insertions(+), 143 deletions(-)
New commits:
commit fcd0c3872276a891ddfb4b9753d14abbb7ec4443
Author: Jacopo Nespolo <j.nespolo at gmail.com>
Date: Mon Oct 4 09:41:50 2010 +0200
Code cleanup in cui
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index d7941c2..8652d93 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -50,7 +50,6 @@
#include "cuitabarea.hxx"
#include "tabarea.hrc"
#include "dlgname.hxx"
-//#include "dlgname.hrc"
#include <dialmgr.hxx>
#define DLGWIN this->GetParent()->GetParent()
@@ -72,7 +71,6 @@ SvxAreaTabDialog::SvxAreaTabDialog
SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_AREA ), pAttr ),
mpDrawModel ( pModel ),
-// mpView ( pSdrView ),
mpColorTab ( pModel->GetColorTable() ),
mpNewColorTab ( pModel->GetColorTable() ),
mpGradientList ( pModel->GetGradientList() ),
@@ -121,13 +119,6 @@ SvxAreaTabDialog::~SvxAreaTabDialog()
void SvxAreaTabDialog::SavePalettes()
{
SfxObjectShell* pShell = SfxObjectShell::Current();
- /*uno::Reference< frame::XDispatchProvider > xDispatchProvider;
- if ( !pShell )
- {
- uno::Reference< frame::XModel> xModel = mpDrawModel->getUnoModel();
- if ( xModel.is() )
- xDispatchProvider.set(xModel->getCurrentController(),uno::UNO_QUERY);
- }*/
if( mpNewColorTab != mpDrawModel->GetColorTable() )
{
if(mbDeleteColorTable)
@@ -280,12 +271,9 @@ void SvxAreaTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage )
( (SvxAreaTabPage&) rPage ).SetGradientList( mpGradientList );
( (SvxAreaTabPage&) rPage ).SetHatchingList( mpHatchingList );
( (SvxAreaTabPage&) rPage ).SetBitmapList( mpBitmapList );
- //CHINA001 ( (SvxAreaTabPage&) rPage ).SetPageType( &mnPageType );
- ( (SvxAreaTabPage&) rPage ).SetPageType( mnPageType ); //add CHINA001
- //CHINA001 ( (SvxAreaTabPage&) rPage ).SetDlgType( &mnDlgType );
- ( (SvxAreaTabPage&) rPage ).SetDlgType( mnDlgType );//add CHINA001
- //CHINA001 ( (SvxAreaTabPage&) rPage ).SetPos( &nPos );
- ( (SvxAreaTabPage&) rPage ).SetPos( mnPos );//add CHINA001
+ ( (SvxAreaTabPage&) rPage ).SetPageType( mnPageType );
+ ( (SvxAreaTabPage&) rPage ).SetDlgType( mnDlgType );
+ ( (SvxAreaTabPage&) rPage ).SetPos( mnPos );
( (SvxAreaTabPage&) rPage ).SetAreaTP( &mbAreaTP );
( (SvxAreaTabPage&) rPage ).SetGrdChgd( &mnGradientListState );
( (SvxAreaTabPage&) rPage ).SetHtchChgd( &mnHatchingListState );
@@ -300,9 +288,8 @@ void SvxAreaTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage )
case RID_SVXPAGE_SHADOW:
{
( (SvxShadowTabPage&) rPage ).SetColorTable( mpColorTab );
- ( (SvxShadowTabPage&) rPage ).SetPageType( mnPageType );//CHINA001 ( (SvxShadowTabPage&) rPage ).SetPageType( &mnPageType );
- ( (SvxShadowTabPage&) rPage ).SetDlgType( mnDlgType );//CHINA001 ( (SvxShadowTabPage&) rPage ).SetDlgType( &mnDlgType );
- //( (SvxShadowTabPage&) rPage ).SetPos( &nPos );
+ ( (SvxShadowTabPage&) rPage ).SetPageType( mnPageType );
+ ( (SvxShadowTabPage&) rPage ).SetDlgType( mnDlgType );
( (SvxShadowTabPage&) rPage ).SetAreaTP( &mbAreaTP );
( (SvxShadowTabPage&) rPage ).SetColorChgd( &mnColorTableState );
( (SvxShadowTabPage&) rPage ).Construct();
@@ -357,12 +344,10 @@ void SvxAreaTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage )
break;
case RID_SVXPAGE_TRANSPARENCE:
- ( (SvxTransparenceTabPage&) rPage ).SetPageType( mnPageType );//CHINA001 ( (SvxTransparenceTabPage&) rPage ).SetPageType( &mnPageType );
- ( (SvxTransparenceTabPage&) rPage ).SetDlgType( mnDlgType );//CHINA001 ( (SvxTransparenceTabPage&) rPage ).SetDlgType( &mnDlgType );
+ ( (SvxTransparenceTabPage&) rPage ).SetPageType( mnPageType );
+ ( (SvxTransparenceTabPage&) rPage ).SetDlgType( mnDlgType );
( (SvxTransparenceTabPage&) rPage ).Construct();
break;
}
}
-
-
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 3a3be44..8906ea1 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -49,9 +49,8 @@
#include "svx/drawitem.hxx"
#include "cuitabarea.hxx"
#include "tabarea.hrc"
-#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx"
-//#include "dlgname.hrc"
-#include <svx/svxdlg.hxx> //CHINA001
+#include "defdlgname.hxx"
+#include <svx/svxdlg.hxx>
#include <dialmgr.hxx>
#include <cuitabline.hxx>
#include <svx/dialmgr.hxx>
@@ -303,18 +302,18 @@ long SvxColorTabPage::CheckChanges_Impl()
ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX,
SVX_RESSTR( RID_SVXSTR_COLOR ),
String( ResId( RID_SVXSTR_ASK_CHANGE_COLOR, rMgr ) ),
&aWarningBoxImage );
- DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001
- aMessDlg->SetButtonText( MESS_BTN_1, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_1,
+ DBG_ASSERT(aMessDlg, "Dialogdiet fail!");
+ aMessDlg->SetButtonText( MESS_BTN_1,
String( ResId( RID_SVXSTR_CHANGE, rMgr ) ) );
- aMessDlg->SetButtonText( MESS_BTN_2, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_2,
+ aMessDlg->SetButtonText( MESS_BTN_2,
String( ResId( RID_SVXSTR_ADD, rMgr ) ) );
- short nRet = aMessDlg->Execute(); //CHINA001 short nRet = aMessDlg.Execute();
+ short nRet = aMessDlg->Execute();
switch( nRet )
{
@@ -334,11 +333,9 @@ long SvxColorTabPage::CheckChanges_Impl()
break;
case RET_CANCEL:
- // return( -1L ); <-- wuerde die Seite nicht verlassen
break;
- // return( TRUE ); // Abbruch
}
- delete aMessDlg; //add by CHINA001
+ delete aMessDlg;
}
}
if( *pDlgType == 0 ) // Flaechen-Dialog
@@ -362,8 +359,6 @@ BOOL SvxColorTabPage::FillItemSet( SfxItemSet& rSet )
String aString;
Color aColor;
- // CheckChanges_Impl(); <-- doppelte Abfrage ?
-
USHORT nPos = aLbColor.GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
@@ -492,9 +487,9 @@ IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
aWarningBox.Execute();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
BOOL bLoop = TRUE;
while ( !bDifferent && bLoop && pDlg->Execute() == RET_OK )
@@ -578,9 +573,9 @@ IMPL_LINK( SvxColorTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
aWarningBox.Execute();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialogdiet fail!");
BOOL bLoop = TRUE;
while ( !bDifferent && bLoop && pDlg->Execute() == RET_OK )
@@ -838,7 +833,6 @@ IMPL_LINK( SvxColorTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
}
else
{
- //aIStream.Close();
ErrorBox aErrorBox( DLGWIN, WinBits( WB_OK ),
String( ResId( RID_SVXSTR_READ_DATA_ERROR, rMgr ) ) );
aErrorBox.Execute();
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 5f5949f..f75cb66 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -53,7 +53,6 @@
#include "svx/dlgutil.hxx"
#include <svx/svdmodel.hxx>
#include "svx/svxgrahicitem.hxx"
-//#include "linectrl.hrc"
#include <sfx2/request.hxx>
#include "svx/ofaitem.hxx"
#include <svx/svdobj.hxx>
@@ -163,7 +162,7 @@ SvxLineTabPage::SvxLineTabPage
pnLineEndListState( 0 ),
pnDashListState( 0 ),
pnColorTableState( 0 ),
- nPageType ( 0 )//CHINA001 pPageType ( NULL ),
+ nPageType ( 0 )
{
FreeResource();
@@ -309,10 +308,10 @@ void SvxLineTabPage::FillListboxes()
void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
{
- SFX_ITEMSET_ARG (&rSet,pPageTypeItem,CntUInt16Item,SID_PAGE_TYPE,sal_False); //add CHINA001 begin
+ SFX_ITEMSET_ARG (&rSet,pPageTypeItem,CntUInt16Item,SID_PAGE_TYPE,sal_False);
if (pPageTypeItem)
- SetPageType(pPageTypeItem->GetValue()); //add CHINA001 end
- if( nDlgType == 0 && pDashList ) //CHINA001 if( *pDlgType == 0 && pDashList ) // Linien-Dialog
+ SetPageType(pPageTypeItem->GetValue());
+ if( nDlgType == 0 && pDashList )
{
USHORT nPos;
USHORT nCount;
@@ -350,20 +349,6 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
aDashURL.Append( pDashList->GetName() );
DBG_ASSERT( aDashURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
-/* // Ermitteln (evtl. abschneiden) des Namens und in
- // der GroupBox darstellen
- String aString( ResId( RID_SVXSTR_TABLE, pMgr ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
-
- if ( aDashURL.getBase().Len() > 18 )
- {
- aString += aDashURL.getBase().Copy( 0, 15 );
- aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
- }
- else
- aString += aDashURL.getBase();
-
- aGrpLine.SetText( aString );
-*/
// LineEndliste
if( ( *pnLineEndListState & CT_MODIFIED ) ||
( *pnLineEndListState & CT_CHANGED ) )
@@ -404,20 +389,6 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
aLineURL.Append( pLineEndList->GetName() );
DBG_ASSERT( aLineURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
-/* // Ermitteln (evtl. abschneiden) des Namens und in
- // der GroupBox darstellen
- aString = String( ResId( RID_SVXSTR_TABLE, pMgr ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
-
- if ( aLineURL.getBase().Len() > 18 )
- {
- aString += aLineURL.getBase().Copy( 0, 15 );
- aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
- }
- else
- aString += aLineURL.getBase();
-
- aGrpLineEnds.SetText( aString );
-*/
// Auswertung, ob von einer anderen TabPage ein anderer Fuelltyp gesetzt wurde
if( aLbLineStyle.GetSelectEntryPos() != 0 )
{
@@ -426,7 +397,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
aLbLineStyle.SelectEntryPos( *pPosDashLb + 2 ); // +2 wegen SOLID und INVLISIBLE
ChangePreviewHdl_Impl( this );
}
- if( nPageType == 3 )//CHINA001 if( *pPageType == 3 )
+ if( nPageType == 3 )
{
aLbStartStyle.SelectEntryPos( *pPosLineEndLb + 1 );// +1 wegen SOLID
aLbEndStyle.SelectEntryPos( *pPosLineEndLb + 1 );// +1 wegen SOLID
@@ -455,12 +426,12 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
ChangePreviewHdl_Impl( this );
}
- nPageType = 0;//CHINA001 *pPageType = 0;
+ nPageType = 0;
}
// Seite existiert im Ctor noch nicht, deswegen hier!
- else if ( nDlgType == 1100 || // Chart-Dialog//CHINA001 else if ( *pDlgType == 1100 || // Chart-Dialog
- nDlgType == 1101 )//CHINA001 *pDlgType == 1101 )
+ else if ( nDlgType == 1100 ||
+ nDlgType == 1101 )
{
aFtLineEndsStyle.Hide();
aFtLineEndsWidth.Hide();
@@ -484,7 +455,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet )
{
- if( nDlgType == 0 ) // Linien-Dialog//CHINA001 if( *pDlgType == 0 ) // Linien-Dialog
+ if( nDlgType == 0 ) // Linien-Dialog
{
nPageType = 1; // evtl. fuer Erweiterungen//CHINA001 *pPageType = 1; // evtl. fuer Erweiterungen
*pPosDashLb = aLbLineStyle.GetSelectEntryPos() - 2;// erster Eintrag SOLID !!!
@@ -510,7 +481,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
// Um evtl. Modifikationen der Liste vorzubeugen
// werden Items anderer Seiten nicht gesetzt
- if( nDlgType != 0 || nPageType != 2 )//CHINA001 if( *pDlgType != 0 || *pPageType != 2 )
+ if( nDlgType != 0 || nPageType != 2 )
{
nPos = aLbLineStyle.GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND &&
@@ -596,7 +567,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
}
}
- if( nDlgType != 0 || nPageType != 3 )//CHINA001 if( *pDlgType != 0 || *pPageType != 3 )
+ if( nDlgType != 0 || nPageType != 3 )
{
// Linienanfang
nPos = aLbStartStyle.GetSelectEntryPos();
@@ -780,7 +751,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
}
}
}
- rAttrs.Put (CntUInt16Item(SID_PAGE_TYPE,nPageType));//add CHINA001
+ rAttrs.Put (CntUInt16Item(SID_PAGE_TYPE,nPageType));
return( bModified );
}
@@ -792,7 +763,6 @@ BOOL SvxLineTabPage::FillXLSet_Impl()
if( aLbLineStyle.GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND )
{
- //rXLSet.Put( XLineDashItem ( rOutAttrs.Get( GetWhich( XATTR_LINEDASH ) ) ) );
rXLSet.Put( XLineStyleItem( XLINE_NONE ) );
}
else if( aLbLineStyle.IsEntryPosSelected( 0 ) )
@@ -895,13 +865,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
XLineStyle eXLS; // XLINE_NONE, XLINE_SOLID, XLINE_DASH
// Linienstil
-/*
- if( bObjSelected &&
- rAttrs.GetItemState( GetWhich( XATTR_LINESTYLE ) ) == SFX_ITEM_DEFAULT )
- {
- aLbLineStyle.Disable();
- }
-*/
const SfxPoolItem *pPoolItem;
long nSymType=SVX_SYMBOLTYPE_UNKNOWN;
BOOL bPrevSym=FALSE;
@@ -938,7 +901,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
SdrView* pView = new SdrView( pModel, &aVDev );
pView->hideMarkHandles();
SdrPageView* pPageView = pView->ShowSdrPage(pPage);
-// SdrPageView* pPageView = pView->ShowSdrPage(pPage, Point());
SdrObject *pObj=NULL;
long nSymTmp=nSymType;
if(pSymbolList)
@@ -1045,13 +1007,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
}
// Linienstaerke
-/*
- if( bObjSelected &&
- rAttrs.GetItemState( GetWhich( XATTR_LINEWIDTH ) ) == SFX_ITEM_DEFAULT )
- {
- aMtrLineWidth.Disable();
- }
-*/
if( rAttrs.GetItemState( XATTR_LINEWIDTH ) != SFX_ITEM_DONTCARE )
{
SetMetricValue( aMtrLineWidth, ( ( const XLineWidthItem& ) rAttrs.
@@ -1061,13 +1016,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
aMtrLineWidth.SetText( String() );
// Linienfarbe
-/*
- if( bObjSelected &&
- rAttrs.GetItemState( GetWhich( XATTR_LINECOLOR ) ) == SFX_ITEM_DEFAULT )
- {
- aLbColor.Disable();
- }
-*/
aLbColor.SetNoSelection();
if ( rAttrs.GetItemState( XATTR_LINECOLOR ) != SFX_ITEM_DONTCARE )
@@ -1268,15 +1216,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
maLBEdgeStyle.SetNoSelection();
}
- /*
- if( aLbStartStyle.GetSelectEntryPos() == aLbEndStyle.GetSelectEntryPos() &&
- aMtrStartWidth.GetValue() == aMtrEndWidth.GetValue() &&
- aTsbCenterStart.GetState() == aTsbCenterEnd.GetState() )
- {
- aCbxSynchronize.Check();
- }
- */
-
// Werte sichern
aLbLineStyle.SaveValue();
aMtrLineWidth.SaveValue();
@@ -1293,8 +1232,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
maLBEdgeStyle.SaveValue();
ClickInvisibleHdl_Impl( this );
- //ClickMeasuringHdl_Impl( this );
- //aCtlPosition.Reset();
ChangePreviewHdl_Impl( NULL );
}
@@ -1486,26 +1423,6 @@ IMPL_LINK( SvxLineTabPage, ChangeEndHdl_Impl, void *, p )
}
//------------------------------------------------------------------------
-/*
-
-long SvxLineTabPage::ClickMeasuringHdl_Impl( void* )
-{
- if( aTsbShowMeasuring.GetState() == STATE_NOCHECK )
- {
- aFtPosition.Disable();
- aCtlPosition.Disable();
- }
- else
- {
- aFtPosition.Enable();
- aCtlPosition.Enable();
- }
- aCtlPosition.Invalidate();
-
- return( 0L );
-}
-*/
-//------------------------------------------------------------------------
IMPL_LINK( SvxLineTabPage, ChangeTransparentHdl_Impl, void *, EMPTYARG )
{
@@ -1614,7 +1531,6 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton )
// 3D View
SdrView* pView = new SdrView( pModel, &aVDev );
pView->hideMarkHandles();
-// SdrPageView* pPageView = pView->ShowSdrPage(pPage, Point());
SdrPageView* pPageView = pView->ShowSdrPage(pPage);
PopupMenu* pPopup = new PopupMenu;
@@ -1625,10 +1541,8 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton )
if(pObj==NULL)
break;
pObj=pObj->Clone();
- //const String* pGrfName = (const String*)aGrfNames.GetObject(i);
- String *pStr=new String();//String(i));
+ String *pStr=new String();
aGrfNames.Insert(pStr,LIST_APPEND);
- //Rectangle aRect(pObj->GetLogicRect());
pPage->NbcInsertObject(pObj);
pView->MarkObj(pObj,pPageView);
if(pSymbolAttr)
@@ -1888,7 +1802,7 @@ void SvxLineTabPage::DataChanged( const DataChangedEvent& rDCEvt )
}
}
-void SvxLineTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001
+void SvxLineTabPage::PageCreated (SfxAllItemSet aSet)
{
SFX_ITEMSET_ARG (&aSet,pColorTabItem,SvxColorTableItem,SID_COLOR_TABLE,sal_False);
SFX_ITEMSET_ARG (&aSet,pDashListItem,SvxDashListItem,SID_DASH_LIST,sal_False);
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index f4bba52..f670c44 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -73,10 +73,10 @@
#include <tools/diagnose_ex.h>
#include <com/sun/star/beans/XPropertyState.hpp>
#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc> //CHINA001
+#include <svx/svxids.hrc>
#endif
-#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
+#include <svx/svxdlg.hxx>
+#include <svx/dialogs.hrc>
#include <svx/flagsdef.hxx>
//............................................................................
namespace pcr
More information about the ooo-build-commit
mailing list