diff options
Diffstat (limited to 'basctl/source/dlged')
| -rw-r--r-- | basctl/source/dlged/dlged.cxx | 86 | ||||
| -rw-r--r-- | basctl/source/dlged/dlgedclip.cxx | 2 | ||||
| -rw-r--r-- | basctl/source/dlged/dlgedfac.cxx | 48 | ||||
| -rw-r--r-- | basctl/source/dlged/dlgedfunc.cxx | 44 | ||||
| -rw-r--r-- | basctl/source/dlged/dlgedlist.cxx | 2 | ||||
| -rw-r--r-- | basctl/source/dlged/dlgedmod.cxx | 2 | ||||
| -rw-r--r-- | basctl/source/dlged/dlgedobj.cxx | 2 | ||||
| -rw-r--r-- | basctl/source/dlged/dlgedpage.cxx | 2 | ||||
| -rw-r--r-- | basctl/source/dlged/dlgedview.cxx | 8 | ||||
| -rw-r--r-- | basctl/source/dlged/dlgresid.src | 2 | ||||
| -rw-r--r-- | basctl/source/dlged/managelang.cxx | 46 | ||||
| -rw-r--r-- | basctl/source/dlged/managelang.hrc | 114 | ||||
| -rw-r--r-- | basctl/source/dlged/managelang.src | 2 | ||||
| -rw-r--r-- | basctl/source/dlged/propbrw.cxx | 10 |
14 files changed, 185 insertions, 185 deletions
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index 324d7d829153..bfb682e73a26 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -38,7 +38,7 @@ #include "dlgedclip.hxx" #include <dlgeddef.hxx> #include "propbrw.hxx" -#include <localizationmgr.hxx> +#include <localizationmgr.hxx> #include <basidesh.hxx> #include <iderdll.hxx> @@ -69,7 +69,7 @@ using namespace comphelper; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::io; +using namespace ::com::sun::star::io; using ::rtl::OUString; static ::rtl::OUString aResourceResolverPropName = @@ -176,7 +176,7 @@ void DlgEditor::ShowDialog() BOOL DlgEditor::UnmarkDialog() { - SdrObject* pDlgObj = pDlgEdModel->GetPage(0)->GetObj(0); + SdrObject* pDlgObj = pDlgEdModel->GetPage(0)->GetObj(0); SdrPageView* pPgView = pDlgEdView->GetSdrPageView(); BOOL bWasMarked = pDlgEdView->IsObjMarked( pDlgObj ); @@ -191,7 +191,7 @@ BOOL DlgEditor::UnmarkDialog() BOOL DlgEditor::RemarkDialog() { - SdrObject* pDlgObj = pDlgEdModel->GetPage(0)->GetObj(0); + SdrObject* pDlgObj = pDlgEdModel->GetPage(0)->GetObj(0); SdrPageView* pPgView = pDlgEdView->GetSdrPageView(); BOOL bWasMarked = pDlgEdView->IsObjMarked( pDlgObj ); @@ -220,7 +220,7 @@ DlgEditor::DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star:: ,eMode( DLGED_SELECT ) ,eActObj( OBJ_DLG_PUSHBUTTON ) ,bFirstDraw(FALSE) - ,aGridSize( 100, 100 ) // 100TH_MM + ,aGridSize( 100, 100 ) // 100TH_MM ,bGridVisible(FALSE) ,bGridSnap(TRUE) ,bCreateOK(TRUE) @@ -244,14 +244,14 @@ DlgEditor::DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star:: pFunc = new DlgEdFuncSelect( this ); // set clipboard data flavors - m_ClipboardDataFlavors[0].MimeType = ::rtl::OUString::createFromAscii("application/vnd.sun.xml.dialog"); - m_ClipboardDataFlavors[0].HumanPresentableName = ::rtl::OUString::createFromAscii("Dialog 6.0"); - m_ClipboardDataFlavors[0].DataType = ::getCppuType( (const Sequence< sal_Int8 >*) 0 ); + m_ClipboardDataFlavors[0].MimeType = ::rtl::OUString::createFromAscii("application/vnd.sun.xml.dialog"); + m_ClipboardDataFlavors[0].HumanPresentableName = ::rtl::OUString::createFromAscii("Dialog 6.0"); + m_ClipboardDataFlavors[0].DataType = ::getCppuType( (const Sequence< sal_Int8 >*) 0 ); - m_ClipboardDataFlavorsResource[0] = m_ClipboardDataFlavors[0]; - m_ClipboardDataFlavorsResource[1].MimeType = ::rtl::OUString::createFromAscii("application/vnd.sun.xml.dialogwithresource"); - m_ClipboardDataFlavorsResource[1].HumanPresentableName = ::rtl::OUString::createFromAscii("Dialog 8.0"); - m_ClipboardDataFlavorsResource[1].DataType = ::getCppuType( (const Sequence< sal_Int8 >*) 0 ); + m_ClipboardDataFlavorsResource[0] = m_ClipboardDataFlavors[0]; + m_ClipboardDataFlavorsResource[1].MimeType = ::rtl::OUString::createFromAscii("application/vnd.sun.xml.dialogwithresource"); + m_ClipboardDataFlavorsResource[1].HumanPresentableName = ::rtl::OUString::createFromAscii("Dialog 8.0"); + m_ClipboardDataFlavorsResource[1].DataType = ::getCppuType( (const Sequence< sal_Int8 >*) 0 ); aPaintTimer.SetTimeout( 1 ); aPaintTimer.SetTimeoutHdl( LINK( this, DlgEditor, PaintTimeout ) ); @@ -292,7 +292,7 @@ void DlgEditor::SetWindow( Window* pWindow_ ) pWindow_->SetMapMode( MapMode( MAP_100TH_MM ) ); pDlgEdPage->SetSize( pWindow_->PixelToLogic( Size( DLGED_PAGE_WIDTH_MIN, DLGED_PAGE_HEIGHT_MIN ) ) ); - pDlgEdView = new DlgEdView( pDlgEdModel, pWindow_, this ); + pDlgEdView = new DlgEdView( pDlgEdModel, pWindow_, this ); pDlgEdView->ShowSdrPage(pDlgEdView->GetModel()->GetPage(0)); pDlgEdView->SetLayerVisible( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "HiddenLayer" ) ), FALSE ); pDlgEdView->SetMoveSnapOnlyTopLeft( TRUE ); @@ -371,8 +371,8 @@ void DlgEditor::DoScroll( ScrollBar* ) // When scrolling, someone was rescuing the Wallpaper and forced the window scroll to // be done without background refresh. I do not know why, but that causes the repaint // problems. Taking that out. - // Wallpaper aOldBackground = pWindow->GetBackground(); - // pWindow->SetBackground(); + // Wallpaper aOldBackground = pWindow->GetBackground(); + // pWindow->SetBackground(); // #i74769# children should be scrolled pWindow->Scroll( -nX, -nY, SCROLL_CHILDREN); // SCROLL_NOCHILDREN ); @@ -416,7 +416,7 @@ void DlgEditor::SetDialog( uno::Reference< container::XNameContainer > xUnoContr pDlgEdModel->GetPage(0)->InsertObject( pDlgEdForm ); AdjustPageSize(); pDlgEdForm->SetRectFromProps(); - pDlgEdForm->UpdateTabIndices(); // for backward compatibility + pDlgEdForm->UpdateTabIndices(); // for backward compatibility pDlgEdForm->StartListening(); // create controls @@ -460,7 +460,7 @@ void DlgEditor::SetDialog( uno::Reference< container::XNameContainer > xUnoContr pDlgEdModel->GetPage(0)->InsertObject( pCtrlObj ); pCtrlObj->SetRectFromProps(); pCtrlObj->UpdateStep(); - pCtrlObj->StartListening(); + pCtrlObj->StartListening(); } } @@ -491,9 +491,9 @@ Reference< util::XNumberFormatsSupplier > const & DlgEditor::GetNumberFormatsSup if ( !m_xSupplier.is() ) { Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); - Reference< util::XNumberFormatsSupplier > xSupplier( xMSF->createInstance( + Reference< util::XNumberFormatsSupplier > xSupplier( xMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatsSupplier") ) ), UNO_QUERY ); - + ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !m_xSupplier.is() ) { @@ -564,7 +564,7 @@ IMPL_LINK( DlgEditor, PaintTimeout, Timer *, EMPTYARG ) ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPSet(pDlgEdForm->GetUnoControlModel(), ::com::sun::star::uno::UNO_QUERY); if ( xPSet.is() ) - { + { // get dialog size from properties sal_Int32 nWidth = 0, nHeight = 0; xPSet->getPropertyValue( DLGED_PROP_WIDTH ) >>= nWidth; @@ -685,7 +685,7 @@ void DlgEditor::SetMode( DlgEdMode eNewMode ) else pFunc = new DlgEdFuncSelect( this ); - if ( eNewMode == DLGED_READONLY ) + if ( eNewMode == DLGED_READONLY ) pDlgEdModel->SetReadOnly( TRUE ); else pDlgEdModel->SetReadOnly( FALSE ); @@ -702,9 +702,9 @@ void DlgEditor::SetMode( DlgEdMode eNewMode ) void DlgEditor::SetInsertObj( USHORT eObj ) { eActObj = eObj; - + if( pDlgEdView ) - pDlgEdView->SetCurrentObj( eActObj, DlgInventor ); + pDlgEdView->SetCurrentObj( eActObj, DlgInventor ); } //---------------------------------------------------------------------------- @@ -762,7 +762,7 @@ void implCopyStreamToByteSequence( Reference< XInputStream > xStream, Sequence< sal_Int8 > readBytes; nRead = xStream->readBytes( readBytes, 1024 ); if (! nRead) - break; + break; sal_Int32 nPos = bytes.getLength(); bytes.realloc( nPos + nRead ); @@ -771,7 +771,7 @@ void implCopyStreamToByteSequence( Reference< XInputStream > xStream, } void DlgEditor::Copy() -{ +{ if( !pDlgEdView->AreObjectsMarked() ) return; @@ -797,7 +797,7 @@ void DlgEditor::Copy() } // insert control models of marked objects into clipboard dialog model - ULONG nMark = pDlgEdView->GetMarkedObjectList().GetMarkCount(); + ULONG nMark = pDlgEdView->GetMarkedObjectList().GetMarkCount(); for( ULONG i = 0; i < nMark; i++ ) { SdrObject* pObj = pDlgEdView->GetMarkedObjectList().GetMark(i)->GetMarkedSdrObj(); @@ -967,7 +967,7 @@ void DlgEditor::Paste() // create clipboard dialog model from xml Reference< lang::XMultiServiceFactory > xMSF = getProcessServiceFactory(); Reference< container::XNameContainer > xClipDialogModel( xMSF->createInstance - ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ), + ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ), uno::UNO_QUERY ); bool bSourceIsLocalized = false; @@ -1045,8 +1045,8 @@ void DlgEditor::Paste() Reference< awt::XControlModel > xCtrlModel( xClone->createClone(), uno::UNO_QUERY ); DlgEdObj* pCtrlObj = new DlgEdObj(); - pCtrlObj->SetDlgEdForm(pDlgEdForm); // set parent form - pDlgEdForm->AddChild(pCtrlObj); // add child to parent form + pCtrlObj->SetDlgEdForm(pDlgEdForm); // set parent form + pDlgEdForm->AddChild(pCtrlObj); // add child to parent form pCtrlObj->SetUnoControlModel( xCtrlModel ); // set control model // set new name @@ -1091,7 +1091,7 @@ void DlgEditor::Paste() pCtrlObj->SetRectFromProps(); pCtrlObj->UpdateStep(); pDlgEdForm->UpdateTabOrderAndGroups(); // #110559# - pCtrlObj->StartListening(); // start listening + pCtrlObj->StartListening(); // start listening // mark object SdrPageView* pPgView = pDlgEdView->GetSdrPageView(); @@ -1103,10 +1103,10 @@ void DlgEditor::Paste() Point aFormCenter = (pDlgEdForm->GetSnapRect()).Center(); Point aPoint = aFormCenter - aMarkCenter; Size aSize( aPoint.X() , aPoint.Y() ); - pDlgEdView->MoveMarkedObj( aSize ); // update of control model properties (position + size) in NbcMove + pDlgEdView->MoveMarkedObj( aSize ); // update of control model properties (position + size) in NbcMove pDlgEdView->MarkListHasChanged(); - // dialog model changed + // dialog model changed SetDialogModelChanged(TRUE); } } @@ -1122,7 +1122,7 @@ void DlgEditor::Delete() return; // remove control models of marked objects from dialog model - ULONG nMark = pDlgEdView->GetMarkedObjectList().GetMarkCount(); + ULONG nMark = pDlgEdView->GetMarkedObjectList().GetMarkCount(); for( ULONG i = 0; i < nMark; i++ ) { @@ -1176,7 +1176,7 @@ void DlgEditor::Delete() BOOL DlgEditor::IsPasteAllowed() { BOOL bPaste = FALSE; - + // get clipboard Reference< datatransfer::clipboard::XClipboard > xClipboard = GetWindow()->GetClipboard(); if ( xClipboard.is() ) @@ -1202,7 +1202,7 @@ BOOL DlgEditor::IsPasteAllowed() void DlgEditor::ShowProperties() { BasicIDEShell* pIDEShell = IDE_DLL()->GetShell(); - SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL; + SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL; if ( pViewFrame && !pViewFrame->HasChildWindow( SID_SHOW_PROPERTYBROWSER ) ) pViewFrame->ToggleChildWindow( SID_SHOW_PROPERTYBROWSER ); } @@ -1231,15 +1231,15 @@ void DlgEditor::ClearModifyFlag() //---------------------------------------------------------------------------- -#define LMARGPRN 1700 -#define RMARGPRN 900 -#define TMARGPRN 2000 -#define BMARGPRN 1000 -#define BORDERPRN 300 +#define LMARGPRN 1700 +#define RMARGPRN 900 +#define TMARGPRN 2000 +#define BMARGPRN 1000 +#define BORDERPRN 300 //---------------------------------------------------------------------------- -void lcl_PrintHeader( Printer* pPrinter, const String& rTitle ) // not working yet +void lcl_PrintHeader( Printer* pPrinter, const String& rTitle ) // not working yet { pPrinter->Push(); @@ -1293,7 +1293,7 @@ void DlgEditor::printPage( sal_Int32 nPage, Printer* pPrinter, const String& rTi //---------------------------------------------------------------------------- -void DlgEditor::Print( Printer* pPrinter, const String& rTitle ) // not working yet +void DlgEditor::Print( Printer* pPrinter, const String& rTitle ) // not working yet { if( pDlgEdView ) { diff --git a/basctl/source/dlged/dlgedclip.cxx b/basctl/source/dlged/dlgedclip.cxx index 17392b2510ac..06285b11f9ff 100644 --- a/basctl/source/dlged/dlgedclip.cxx +++ b/basctl/source/dlged/dlgedclip.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx index 27bae6fbb8c7..39531f21457f 100644 --- a/basctl/source/dlged/dlgedfac.cxx +++ b/basctl/source/dlged/dlgedfac.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -72,7 +72,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) } bNeedsInit = sal_False; } - + if( (pObjFactory->nInventor == DlgInventor) && (pObjFactory->nIdentifier >= OBJ_DLG_PUSHBUTTON) && (pObjFactory->nIdentifier <= OBJ_DLG_TREECONTROL) ) @@ -92,7 +92,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlListBoxModel") , xDialogSFact ); break; case OBJ_DLG_COMBOBOX: - { + { DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlComboBoxModel") , xDialogSFact ); pObjFactory->pNewObj = pNew; try @@ -107,7 +107,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) catch(...) { } - } break; + } break; case OBJ_DLG_GROUPBOX: pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlGroupBoxModel") , xDialogSFact ); break; @@ -122,7 +122,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) break; case OBJ_DLG_PROGRESSBAR: pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlProgressBarModel") , xDialogSFact ); - break; + break; case OBJ_DLG_HSCROLLBAR: pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlScrollBarModel") , xDialogSFact ); break; @@ -130,7 +130,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) { DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlScrollBarModel") , xDialogSFact ); pObjFactory->pNewObj = pNew; - // set vertical orientation + // set vertical orientation try { uno::Reference< beans::XPropertySet > xPSet(pNew->GetUnoControlModel(), uno::UNO_QUERY); @@ -144,7 +144,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) catch(...) { } - } break; + } break; case OBJ_DLG_HFIXEDLINE: pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFixedLineModel") , xDialogSFact ); break; @@ -152,7 +152,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) { DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFixedLineModel") , xDialogSFact ); pObjFactory->pNewObj = pNew; - // set vertical orientation + // set vertical orientation try { uno::Reference< beans::XPropertySet > xPSet(pNew->GetUnoControlModel(), uno::UNO_QUERY); @@ -166,28 +166,28 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) catch(...) { } - } break; + } break; case OBJ_DLG_DATEFIELD: pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlDateFieldModel") , xDialogSFact ); - break; + break; case OBJ_DLG_TIMEFIELD: pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlTimeFieldModel") , xDialogSFact ); - break; + break; case OBJ_DLG_NUMERICFIELD: pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlNumericFieldModel") , xDialogSFact ); - break; + break; case OBJ_DLG_CURRENCYFIELD: pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlCurrencyFieldModel") , xDialogSFact ); - break; + break; case OBJ_DLG_FORMATTEDFIELD: pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFormattedFieldModel") , xDialogSFact ); - break; + break; case OBJ_DLG_PATTERNFIELD: pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlPatternFieldModel") , xDialogSFact ); - break; + break; case OBJ_DLG_FILECONTROL: pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFileControlModel") , xDialogSFact ); - break; + break; case OBJ_DLG_TREECONTROL: DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.tree.TreeControlModel") , xDialogSFact ); pObjFactory->pNewObj = pNew; @@ -206,12 +206,12 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) // gets the service manager from the office Reference< XMultiComponentFactory > xMultiComponentFactoryServer( xComponentContext->getServiceManager() ); - + // gets the TreeDataModel Reference< XMutableTreeDataModel > xTreeDataModel; xTreeDataModel = Reference< XMutableTreeDataModel >( - xMultiComponentFactoryServer->createInstanceWithContext( + xMultiComponentFactoryServer->createInstanceWithContext( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.tree.MutableTreeDataModel" ) ), xComponentContext ), UNO_QUERY_THROW ); // now fill it with some sample data @@ -228,7 +228,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) xChildNode_1->setDataValue( sNode_1 ); xChildNode_1->setExpandedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_down.png" ) ) ); xChildNode_1->setCollapsedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_right.png" ) ) ); - + xNode->appendChild( xChildNode_1 ); const OUString sNode_1_1( RTL_CONSTASCII_USTRINGPARAM( "Node_1_1" ) ); @@ -237,7 +237,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) xChildNode_1_1->setDataValue( sNode_1_1 ); xChildNode_1_1->setExpandedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_down.png" ) ) ); xChildNode_1_1->setCollapsedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_right.png" ) ) ); - + xChildNode_1->appendChild( xChildNode_1_1 ); const OUString sNode_1_1( RTL_CONSTASCII_USTRINGPARAM( "Node_2" ) ); @@ -246,10 +246,10 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) xChildNode_2->setDataValue( sNode_2 ); xChildNode_2->setNodeGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM("private:graphicrepository/sw/imglst/nc20010.png") ) ); xNode->appendChild( xChildNode_2 ); - + xTreeDataModel->setRoot( xNode ); - - + + const OUString sDataModel( RTL_CONSTASCII_USTRINGPARAM( "DataModel" ) ); xPSet->setPropertyValue( sDataModel, xTreeDataModel ); @@ -258,7 +258,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) catch(...) { }*/ - break; + break; } } diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx index 9ef46deb69c0..702af3c6a0d8 100644 --- a/basctl/source/dlged/dlgedfunc.cxx +++ b/basctl/source/dlged/dlgedfunc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -160,7 +160,7 @@ BOOL DlgEdFunc::KeyInput( const KeyEvent& rKEvt ) ((SdrHdlList&)rHdlList).ResetFocusHdl(); else pView->UnmarkAll(); - + bReturn = TRUE; } } @@ -314,7 +314,7 @@ BOOL DlgEdFunc::KeyInput( const KeyEvent& rKEvt ) pView->MovAction( aEndPoint ); pView->EndDragObj(); - + // restore snap if ( !bWasNoSnap ) ((SdrDragStat&)rDragStat).SetNoSnap( bWasNoSnap ); @@ -414,7 +414,7 @@ BOOL DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt ) pParent->ShowProperties(); } - return TRUE; + return TRUE; } //---------------------------------------------------------------------------- @@ -451,7 +451,7 @@ BOOL DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt ) if ( pView->IsDragObj() ) pView->EndDragObj( rMEvt.IsMod1() ); return TRUE; - } + } } //---------------------------------------------------------------------------- @@ -462,7 +462,7 @@ BOOL DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt ) Window* pWindow= pParent->GetWindow(); pView->SetActualWin( pWindow ); - Point aPos( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); + Point aPos( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); USHORT nHitLog = USHORT ( pWindow->PixelToLogic(Size(3,0)).Width() ); if ( pView->IsAction() ) @@ -524,9 +524,9 @@ BOOL DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt ) if( pView->PickObj( aMDPos, nHitLog, pObj, pPV ) ) { //if( pObj->ISA( DlgEdForm ) ) - // pView->UnmarkAll(); + // pView->UnmarkAll(); //else - // pParent->UnmarkDialog(); + // pParent->UnmarkDialog(); } } @@ -585,22 +585,22 @@ BOOL DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt ) } } -// USHORT nClicks = rMEvt.GetClicks(); -// if (nClicks == 2) -// { -// if ( pView->AreObjectsMarked() ) -// { -// const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); +// USHORT nClicks = rMEvt.GetClicks(); +// if (nClicks == 2) +// { +// if ( pView->AreObjectsMarked() ) +// { +// const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); // -// if (rMarkList.GetMarkCount() == 1) -// { -// SdrMark* pMark = rMarkList.GetMark(0); -// SdrObject* pObj = pMark->GetMarkedSdrObj(); +// if (rMarkList.GetMarkCount() == 1) +// { +// SdrMark* pMark = rMarkList.GetMark(0); +// SdrObject* pObj = pMark->GetMarkedSdrObj(); // -// // edit objects here -// } -// } -// } +// // edit objects here +// } +// } +// } bMarkAction = FALSE; diff --git a/basctl/source/dlged/dlgedlist.cxx b/basctl/source/dlged/dlgedlist.cxx index 41fa01b262c8..ff34ca8a346a 100644 --- a/basctl/source/dlged/dlgedlist.cxx +++ b/basctl/source/dlged/dlgedlist.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/basctl/source/dlged/dlgedmod.cxx b/basctl/source/dlged/dlgedmod.cxx index ceb5555a1bc2..3afcd86d79a2 100644 --- a/basctl/source/dlged/dlgedmod.cxx +++ b/basctl/source/dlged/dlgedmod.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index 769290fe0690..f956f817e0b0 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -827,7 +827,7 @@ sal_Bool DlgEdObj::supportsService( const sal_Char* _pServiceName ) const do { aUniqueName = aDefaultName + ::rtl::OUString::valueOf(++n); - } while (xNameAcc->hasByName(aUniqueName)); + } while (xNameAcc->hasByName(aUniqueName)); } return aUniqueName; diff --git a/basctl/source/dlged/dlgedpage.cxx b/basctl/source/dlged/dlgedpage.cxx index 58fe333dfac3..a327bac760f7 100644 --- a/basctl/source/dlged/dlgedpage.cxx +++ b/basctl/source/dlged/dlgedpage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/basctl/source/dlged/dlgedview.cxx b/basctl/source/dlged/dlgedview.cxx index d98967a3e776..335974554282 100644 --- a/basctl/source/dlged/dlgedview.cxx +++ b/basctl/source/dlged/dlgedview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -173,12 +173,12 @@ SdrObject* impLocalHitCorrection(SdrObject* pRetval, const Point& rPnt, USHORT n // will access aOutRect directly const Rectangle aOuterRectangle(pDlgEdObj->GetLastBoundRect()); - if(!aOuterRectangle.IsEmpty() - && RECT_EMPTY != aOuterRectangle.Right() + if(!aOuterRectangle.IsEmpty() + && RECT_EMPTY != aOuterRectangle.Right() && RECT_EMPTY != aOuterRectangle.Bottom()) { basegfx::B2DRange aOuterRange( - aOuterRectangle.Left(), aOuterRectangle.Top(), + aOuterRectangle.Left(), aOuterRectangle.Top(), aOuterRectangle.Right(), aOuterRectangle.Bottom()); if(nTol) diff --git a/basctl/source/dlged/dlgresid.src b/basctl/source/dlged/dlgresid.src index ee37d82233e1..4512dc75247e 100644 --- a/basctl/source/dlged/dlgresid.src +++ b/basctl/source/dlged/dlgresid.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index e33e68c3dd67..f39ebb0ccbb8 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -72,7 +72,7 @@ namespace { long getLongestWordWidth( const String& rText, const Window& rWin ) { long nWidth = 0; - Reference< XBreakIterator > xBreakIter( vcl::unohelper::CreateBreakIterator() ); + Reference< XBreakIterator > xBreakIter( vcl::unohelper::CreateBreakIterator() ); sal_Int32 nStartPos = 0; const Locale aLocale = Application::GetSettings().GetUILocale(); Boundary aBoundary = xBreakIter->getWordBoundary( @@ -99,19 +99,19 @@ ManageLanguageDialog::ManageLanguageDialog( Window* pParent, LocalizationMgr* _p ModalDialog( pParent, IDEResId( RID_DLG_MANAGE_LANGUAGE ) ), - m_aLanguageFT ( this, IDEResId( FT_LANGUAGE ) ), - m_aLanguageLB ( this, IDEResId( LB_LANGUAGE ) ), - m_aAddPB ( this, IDEResId( PB_ADD_LANG ) ), - m_aDeletePB ( this, IDEResId( PB_DEL_LANG ) ), - m_aMakeDefPB ( this, IDEResId( PB_MAKE_DEFAULT ) ), - m_aInfoFT ( this, IDEResId( FT_INFO ) ), - m_aBtnLine ( this, IDEResId( FL_BUTTONS ) ), - m_aHelpBtn ( this, IDEResId( PB_HELP ) ), - m_aCloseBtn ( this, IDEResId( PB_CLOSE ) ), - m_pLocalizationMgr ( _pLMgr ), - m_sDefLangStr ( IDEResId( STR_DEF_LANG ) ), - m_sDeleteStr ( IDEResId( STR_DELETE ) ), - m_sCreateLangStr ( IDEResId( STR_CREATE_LANG ) ) + m_aLanguageFT ( this, IDEResId( FT_LANGUAGE ) ), + m_aLanguageLB ( this, IDEResId( LB_LANGUAGE ) ), + m_aAddPB ( this, IDEResId( PB_ADD_LANG ) ), + m_aDeletePB ( this, IDEResId( PB_DEL_LANG ) ), + m_aMakeDefPB ( this, IDEResId( PB_MAKE_DEFAULT ) ), + m_aInfoFT ( this, IDEResId( FT_INFO ) ), + m_aBtnLine ( this, IDEResId( FL_BUTTONS ) ), + m_aHelpBtn ( this, IDEResId( PB_HELP ) ), + m_aCloseBtn ( this, IDEResId( PB_CLOSE ) ), + m_pLocalizationMgr ( _pLMgr ), + m_sDefLangStr ( IDEResId( STR_DEF_LANG ) ), + m_sDeleteStr ( IDEResId( STR_DELETE ) ), + m_sCreateLangStr ( IDEResId( STR_CREATE_LANG ) ) { FreeResource(); @@ -304,14 +304,14 @@ SetDefaultLanguageDialog::SetDefaultLanguageDialog( Window* pParent, Localizatio ModalDialog( pParent, IDEResId( RID_DLG_SETDEF_LANGUAGE ) ), - m_aLanguageFT ( this, IDEResId( FT_DEF_LANGUAGE ) ), - m_pLanguageLB ( new SvxLanguageBox( this, IDEResId( LB_DEF_LANGUAGE ) ) ), - m_pCheckLangLB ( NULL ), - m_aInfoFT ( this, IDEResId( FT_DEF_INFO ) ), - m_aBtnLine ( this, IDEResId( FL_DEF_BUTTONS ) ), - m_aOKBtn ( this, IDEResId( PB_DEF_OK ) ), - m_aCancelBtn ( this, IDEResId( PB_DEF_CANCEL ) ), - m_aHelpBtn ( this, IDEResId( PB_DEF_HELP ) ), + m_aLanguageFT ( this, IDEResId( FT_DEF_LANGUAGE ) ), + m_pLanguageLB ( new SvxLanguageBox( this, IDEResId( LB_DEF_LANGUAGE ) ) ), + m_pCheckLangLB ( NULL ), + m_aInfoFT ( this, IDEResId( FT_DEF_INFO ) ), + m_aBtnLine ( this, IDEResId( FL_DEF_BUTTONS ) ), + m_aOKBtn ( this, IDEResId( PB_DEF_OK ) ), + m_aCancelBtn ( this, IDEResId( PB_DEF_CANCEL ) ), + m_aHelpBtn ( this, IDEResId( PB_DEF_HELP ) ), m_pLocalizationMgr( _pLMgr ) diff --git a/basctl/source/dlged/managelang.hrc b/basctl/source/dlged/managelang.hrc index e3a7f7f1edde..6abb2ae3b314 100644 --- a/basctl/source/dlged/managelang.hrc +++ b/basctl/source/dlged/managelang.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -34,73 +34,73 @@ // Dialog Control Id's ----------------------------------------------------------- -#define FT_LANGUAGE 1 -#define LB_LANGUAGE 2 -#define PB_ADD_LANG 3 -#define PB_DEL_LANG 4 -#define PB_MAKE_DEFAULT 5 -#define FT_INFO 6 -#define FL_BUTTONS 7 -#define PB_HELP 8 -#define PB_CLOSE 9 -#define STR_DEF_LANG 10 -#define STR_DELETE 11 -#define STR_CREATE_LANG 12 - -#define FT_DEF_LANGUAGE 1 -#define LB_DEF_LANGUAGE 2 -#define LB_ADD_LANGUAGE 3 -#define FT_DEF_INFO 4 -#define FL_DEF_BUTTONS 5 -#define PB_DEF_OK 6 -#define PB_DEF_CANCEL 7 -#define PB_DEF_HELP 8 -#define STR_ADDLANG_TITLE 9 -#define STR_ADDLANG_LABEL 10 -#define STR_ADDLANG_INFO 11 +#define FT_LANGUAGE 1 +#define LB_LANGUAGE 2 +#define PB_ADD_LANG 3 +#define PB_DEL_LANG 4 +#define PB_MAKE_DEFAULT 5 +#define FT_INFO 6 +#define FL_BUTTONS 7 +#define PB_HELP 8 +#define PB_CLOSE 9 +#define STR_DEF_LANG 10 +#define STR_DELETE 11 +#define STR_CREATE_LANG 12 + +#define FT_DEF_LANGUAGE 1 +#define LB_DEF_LANGUAGE 2 +#define LB_ADD_LANGUAGE 3 +#define FT_DEF_INFO 4 +#define FL_DEF_BUTTONS 5 +#define PB_DEF_OK 6 +#define PB_DEF_CANCEL 7 +#define PB_DEF_HELP 8 +#define STR_ADDLANG_TITLE 9 +#define STR_ADDLANG_LABEL 10 +#define STR_ADDLANG_INFO 11 // Metrics ----------------------------------------------------------------------- -#define MANAGE_DLG_WIDTH 240 -#define MANAGE_DLG_HEIGHT 180 -#define INFO_LINES_COUNT 3 +#define MANAGE_DLG_WIDTH 240 +#define MANAGE_DLG_HEIGHT 180 +#define INFO_LINES_COUNT 3 -#define MANAGE_COL1 RSC_SP_DLG_INNERBORDER_LEFT -#define MANAGE_COL2 (MANAGE_DLG_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT - 2*RSC_CD_PUSHBUTTON_WIDTH - RSC_SP_CTRL_X) -#define MANAGE_COL3 (MANAGE_COL2 + RSC_CD_PUSHBUTTON_WIDTH + RSC_SP_CTRL_X) +#define MANAGE_COL1 RSC_SP_DLG_INNERBORDER_LEFT +#define MANAGE_COL2 (MANAGE_DLG_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT - 2*RSC_CD_PUSHBUTTON_WIDTH - RSC_SP_CTRL_X) +#define MANAGE_COL3 (MANAGE_COL2 + RSC_CD_PUSHBUTTON_WIDTH + RSC_SP_CTRL_X) -#define MANAGE_ROW1 RSC_SP_DLG_INNERBORDER_TOP -#define MANAGE_ROW2 (MANAGE_ROW1 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y) -#define MANAGE_ROW3 (MANAGE_ROW2 + RSC_CD_PUSHBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y) +#define MANAGE_ROW1 RSC_SP_DLG_INNERBORDER_TOP +#define MANAGE_ROW2 (MANAGE_ROW1 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y) +#define MANAGE_ROW3 (MANAGE_ROW2 + RSC_CD_PUSHBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y) -#define MANAGE_ROW7 (MANAGE_DLG_HEIGHT - RSC_SP_DLG_INNERBORDER_BOTTOM - RSC_CD_PUSHBUTTON_HEIGHT) -#define MANAGE_ROW6 (MANAGE_ROW7 - RSC_SP_FLGR_SPACE_Y - RSC_CD_FIXEDLINE_HEIGHT) -#define MANAGE_ROW5 (MANAGE_ROW6 - RSC_SP_FLGR_SPACE_Y - INFO_LINES_COUNT*RSC_CD_FIXEDTEXT_HEIGHT) -#define MANAGE_ROW4 (MANAGE_ROW5 - RSC_SP_CTRL_GROUP_Y - RSC_CD_PUSHBUTTON_HEIGHT) -#define MANAGE_ROW4A (MANAGE_ROW4 + RSC_CD_PUSHBUTTON_HEIGHT) +#define MANAGE_ROW7 (MANAGE_DLG_HEIGHT - RSC_SP_DLG_INNERBORDER_BOTTOM - RSC_CD_PUSHBUTTON_HEIGHT) +#define MANAGE_ROW6 (MANAGE_ROW7 - RSC_SP_FLGR_SPACE_Y - RSC_CD_FIXEDLINE_HEIGHT) +#define MANAGE_ROW5 (MANAGE_ROW6 - RSC_SP_FLGR_SPACE_Y - INFO_LINES_COUNT*RSC_CD_FIXEDTEXT_HEIGHT) +#define MANAGE_ROW4 (MANAGE_ROW5 - RSC_SP_CTRL_GROUP_Y - RSC_CD_PUSHBUTTON_HEIGHT) +#define MANAGE_ROW4A (MANAGE_ROW4 + RSC_CD_PUSHBUTTON_HEIGHT) -#define MANAGE_LB_WIDTH (MANAGE_COL3 - RSC_SP_CTRL_X - RSC_SP_DLG_INNERBORDER_LEFT) -#define MANAGE_LB_HEIGHT (MANAGE_ROW4A - MANAGE_ROW2) +#define MANAGE_LB_WIDTH (MANAGE_COL3 - RSC_SP_CTRL_X - RSC_SP_DLG_INNERBORDER_LEFT) +#define MANAGE_LB_HEIGHT (MANAGE_ROW4A - MANAGE_ROW2) -#define SETDEF_DLG_WIDTH 180 -#define SETDEF_DLG_HEIGHT 165 +#define SETDEF_DLG_WIDTH 180 +#define SETDEF_DLG_HEIGHT 165 -#define SETDEF_COL1 RSC_SP_DLG_INNERBORDER_LEFT -#define SETDEF_COL2 (SETDEF_DLG_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT - 3*RSC_CD_PUSHBUTTON_WIDTH - RSC_SP_CTRL_GROUP_X - RSC_SP_CTRL_X) -#define SETDEF_COL3 (SETDEF_COL2 + RSC_CD_PUSHBUTTON_WIDTH + RSC_SP_CTRL_GROUP_X) -#define SETDEF_COL4 (SETDEF_COL3 + RSC_CD_PUSHBUTTON_WIDTH + RSC_SP_CTRL_X) -#define SETDEF_COL4A (SETDEF_COL4 + RSC_CD_PUSHBUTTON_WIDTH) +#define SETDEF_COL1 RSC_SP_DLG_INNERBORDER_LEFT +#define SETDEF_COL2 (SETDEF_DLG_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT - 3*RSC_CD_PUSHBUTTON_WIDTH - RSC_SP_CTRL_GROUP_X - RSC_SP_CTRL_X) +#define SETDEF_COL3 (SETDEF_COL2 + RSC_CD_PUSHBUTTON_WIDTH + RSC_SP_CTRL_GROUP_X) +#define SETDEF_COL4 (SETDEF_COL3 + RSC_CD_PUSHBUTTON_WIDTH + RSC_SP_CTRL_X) +#define SETDEF_COL4A (SETDEF_COL4 + RSC_CD_PUSHBUTTON_WIDTH) -#define SETDEF_ROW1 RSC_SP_DLG_INNERBORDER_TOP -#define SETDEF_ROW2 (SETDEF_ROW1 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y) +#define SETDEF_ROW1 RSC_SP_DLG_INNERBORDER_TOP +#define SETDEF_ROW2 (SETDEF_ROW1 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y) -#define SETDEF_ROW5 (SETDEF_DLG_HEIGHT - RSC_SP_DLG_INNERBORDER_BOTTOM - RSC_CD_PUSHBUTTON_HEIGHT) -#define SETDEF_ROW4 (SETDEF_ROW5 - RSC_SP_FLGR_SPACE_Y - RSC_CD_FIXEDLINE_HEIGHT) -#define SETDEF_ROW3 (SETDEF_ROW4 - RSC_SP_FLGR_SPACE_Y - INFO_LINES_COUNT*RSC_CD_FIXEDTEXT_HEIGHT) -#define SETDEF_ROW3A (SETDEF_ROW3 - RSC_SP_CTRL_GROUP_Y) +#define SETDEF_ROW5 (SETDEF_DLG_HEIGHT - RSC_SP_DLG_INNERBORDER_BOTTOM - RSC_CD_PUSHBUTTON_HEIGHT) +#define SETDEF_ROW4 (SETDEF_ROW5 - RSC_SP_FLGR_SPACE_Y - RSC_CD_FIXEDLINE_HEIGHT) +#define SETDEF_ROW3 (SETDEF_ROW4 - RSC_SP_FLGR_SPACE_Y - INFO_LINES_COUNT*RSC_CD_FIXEDTEXT_HEIGHT) +#define SETDEF_ROW3A (SETDEF_ROW3 - RSC_SP_CTRL_GROUP_Y) -#define SETDEF_LB_WIDTH (SETDEF_COL4A - SETDEF_COL1) -#define SETDEF_LB_HEIGHT (SETDEF_ROW3A - SETDEF_ROW2) +#define SETDEF_LB_WIDTH (SETDEF_COL4A - SETDEF_COL1) +#define SETDEF_LB_HEIGHT (SETDEF_ROW3A - SETDEF_ROW2) -#endif // _BASCTL_MANAGELANG_HRC +#endif // _BASCTL_MANAGELANG_HRC diff --git a/basctl/source/dlged/managelang.src b/basctl/source/dlged/managelang.src index b03421e1aa22..6b54abcb182a 100644 --- a/basctl/source/dlged/managelang.src +++ b/basctl/source/dlged/managelang.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx index d210482a8ef5..a041c8e7a343 100644 --- a/basctl/source/dlged/propbrw.cxx +++ b/basctl/source/dlged/propbrw.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -83,7 +83,7 @@ SFX_IMPL_FLOATINGWINDOW(PropBrwMgr, SID_SHOW_PROPERTYBROWSER) //---------------------------------------------------------------------------- -PropBrwMgr::PropBrwMgr( Window* _pParent, sal_uInt16 nId, +PropBrwMgr::PropBrwMgr( Window* _pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo* pInfo) :SfxChildWindow( _pParent, nId ) { @@ -197,7 +197,7 @@ void PropBrw::ImplReCreateController() xFactoryProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ), UNO_QUERY_THROW ); - // a ComponentContext for the + // a ComponentContext for the ::cppu::ContextEntry_Init aHandlerContextInfo[] = { ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DialogParentWindow" ) ), makeAny( VCLUnoHelper::GetInterface ( this ) ) ), @@ -503,8 +503,8 @@ void PropBrw::implSetNewObject( const Reference< XPropertySet >& _rxObject ) // #i73075 Handled in implSetNewObjectSequence //else // multiselection //{ - // aName = ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_PROPERTIES))); - // aName += ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_MULTISELECT))); + // aName = ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_PROPERTIES))); + // aName += ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_MULTISELECT))); //} return aName; |