[Libreoffice-commits] .: 3 commits - automation/source basctl/source
Sebastian Spaeth
spaetz at kemper.freedesktop.org
Tue Nov 9 00:17:05 PST 2010
automation/source/testtool/objtest.cxx | 2
basctl/source/accessibility/accessibledialogcontrolshape.cxx | 4
basctl/source/accessibility/accessibledialogwindow.cxx | 24 ++---
basctl/source/basicide/baside3.cxx | 46 +++++------
basctl/source/basicide/basides1.cxx | 10 +-
basctl/source/basicide/basidesh.cxx | 8 -
basctl/source/basicide/bastype2.cxx | 40 ++++-----
basctl/source/basicide/localizationmgr.cxx | 28 +++---
basctl/source/basicide/scriptdocument.cxx | 18 ++--
basctl/source/basicide/unomodel.cxx | 2
basctl/source/dlged/dlged.cxx | 36 ++++----
basctl/source/dlged/dlgedfac.cxx | 42 +++++-----
basctl/source/dlged/propbrw.cxx | 4
13 files changed, 131 insertions(+), 133 deletions(-)
New commits:
commit ac173b86574e9b14a0ac309ea5f642efd5efbeb4
Author: Kevin Hunter <hunteke at earlham.edu>
Date: Mon Nov 8 03:38:41 2010 -0500
EOL whitespace removal
Don't clutter further commits with unimportant whitespace.
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index 2d5fcfb..5763f76 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.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
@@ -251,7 +251,7 @@ void AccessibleDialogControlShape::FillAccessibleStateSet( utl::AccessibleStateS
}
// -----------------------------------------------------------------------------
-// OCommonAccessibleComponent
+// OCommonAccessibleComponent
// -----------------------------------------------------------------------------
awt::Rectangle AccessibleDialogControlShape::implGetBounds() throw (RuntimeException)
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index 64629dc..9950d21 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.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
@@ -66,7 +66,7 @@ DBG_NAME( AccessibleDialogWindow )
AccessibleDialogWindow::ChildDescriptor::ChildDescriptor( DlgEdObj* _pDlgEdObj )
:pDlgEdObj( _pDlgEdObj )
,rxAccessible( 0 )
-{
+{
}
// -----------------------------------------------------------------------------
@@ -338,7 +338,7 @@ void AccessibleDialogWindow::RemoveChild( const ChildDescriptor& rDesc )
void AccessibleDialogWindow::UpdateChild( const ChildDescriptor& rDesc )
{
if ( IsChildVisible( rDesc ) )
- {
+ {
// if the object is not in the child list, insert child
InsertChild( rDesc );
}
@@ -443,13 +443,13 @@ void AccessibleDialogWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindo
case VCLEVENT_WINDOW_SHOW:
{
aNewValue <<= AccessibleStateType::SHOWING;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
}
break;
case VCLEVENT_WINDOW_HIDE:
{
aOldValue <<= AccessibleStateType::SHOWING;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
}
break;
case VCLEVENT_WINDOW_RESIZE:
@@ -518,7 +518,7 @@ void AccessibleDialogWindow::FillAccessibleStateSet( utl::AccessibleStateSetHelp
}
// -----------------------------------------------------------------------------
-// OCommonAccessibleComponent
+// OCommonAccessibleComponent
// -----------------------------------------------------------------------------
awt::Rectangle AccessibleDialogWindow::implGetBounds() throw (RuntimeException)
@@ -551,7 +551,7 @@ void AccessibleDialogWindow::Notify( SfxBroadcaster&, const SfxHint& rHint )
if ( IsChildVisible( aDesc ) )
InsertChild( aDesc );
}
- }
+ }
break;
case HINT_OBJREMOVED:
{
@@ -856,8 +856,8 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt
{
Reference< XAccessible > xAcc = getAccessibleChild( i );
if ( xAcc.is() )
- {
- Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY );
+ {
+ Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY );
if ( xComp.is() )
{
Rectangle aRect = VCLRectangle( xComp->getBounds() );
@@ -1007,7 +1007,7 @@ void AccessibleDialogWindow::selectAccessibleChild( sal_Int32 nChildIndex ) thro
// -----------------------------------------------------------------------------
sal_Bool AccessibleDialogWindow::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
-{
+{
OExternalLockGuard aGuard( this );
if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
@@ -1065,7 +1065,7 @@ sal_Int32 AccessibleDialogWindow::getSelectedAccessibleChildCount( ) throw (Run
sal_Int32 nRet = 0;
for ( sal_Int32 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i )
- {
+ {
if ( isAccessibleChildSelected( i ) )
++nRet;
}
@@ -1085,7 +1085,7 @@ Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal
Reference< XAccessible > xChild;
for ( sal_Int32 i = 0, j = 0, nCount = getAccessibleChildCount(); i < nCount; ++i )
- {
+ {
if ( isAccessibleChildSelected( i ) && ( j++ == nSelectedChildIndex ) )
{
xChild = getAccessibleChild( i );
commit 97b52d261792f52ca53472c6a08c0f256eafb84a
Author: Kevin Hunter <hunteke at earlham.edu>
Date: Mon Nov 8 03:14:20 2010 -0500
Remove commented out #ifdef/#endif
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 199b368..dce50bd 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -44,9 +44,7 @@
#include <vcl/svapp.hxx>
#include <svtools/stringtransfer.hxx>
#include <svl/brdcst.hxx>
-//#ifndef _SBXCLASS_HXX //autogen
#include <basic/sbx.hxx>
-//#endif
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/frame/XDesktop.hpp>
#include <comphelper/processfactory.hxx>
commit 8af3482dc8197f32260d341052dc48b04c3200b2
Author: Kevin Hunter <hunteke at earlham.edu>
Date: Mon Nov 8 02:50:52 2010 -0500
EOL whitespace removal
Don't clutter other patches with silly whitespace changes.
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index df0b7db..12d0d72 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.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
@@ -47,7 +47,7 @@
#include <vector>
#include <basidesh.hrc>
#include <baside3.hxx>
-#include <localizationmgr.hxx>
+#include <localizationmgr.hxx>
#include <accessibledialogwindow.hxx>
#include <dlged.hxx>
#include <dlgedmod.hxx>
@@ -129,7 +129,7 @@ DialogWindow::DialogWindow( Window* pParent, const ScriptDocument& rDocument, St
// set readonly mode for readonly libraries
::rtl::OUString aOULibName( aLibName );
Reference< script::XLibraryContainer2 > xDlgLibContainer( GetDocument().getLibraryContainer( E_DIALOGS ), UNO_QUERY );
- if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) && xDlgLibContainer->isLibraryReadOnly( aOULibName ) )
+ if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) && xDlgLibContainer->isLibraryReadOnly( aOULibName ) )
SetReadOnly( TRUE );
if ( rDocument.isDocument() && rDocument.isReadOnly() )
@@ -259,10 +259,10 @@ void DialogWindow::Command( const CommandEvent& rCEvt )
{
pDispatcher->ExecutePopup( IDEResId(RID_POPUP_DLGED) );
}
-
+
}
}
- else
+ else
IDEBaseWindow::Command( rCEvt );
}
@@ -416,7 +416,7 @@ void __EXPORT DialogWindow::GetState( SfxItemSet& rSet )
case SID_SHOW_PROPERTYBROWSER:
{
BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
- SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
+ SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
if ( pViewFrame && !pViewFrame->HasChildWindow( SID_SHOW_PROPERTYBROWSER ) && !pEditor->GetView()->AreObjectsMarked() )
rSet.DisableItem( nWh );
@@ -647,7 +647,7 @@ void __EXPORT DialogWindow::ExecuteCommand( SfxRequest& rReq )
rReq.Done();
}
-Reference< container::XNameContainer > DialogWindow::GetDialog() const
+Reference< container::XNameContainer > DialogWindow::GetDialog() const
{
return pEditor->GetDialog();
}
@@ -733,16 +733,16 @@ BOOL DialogWindow::SaveDialog()
Reference< XSimpleFileAccess > xSFI( xMSF->createInstance
( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY );
-
+
Reference< XOutputStream > xOutput;
try
{
if( xSFI->exists( aCurPath ) )
xSFI->kill( aCurPath );
- xOutput = xSFI->openFileWrite( aCurPath );
+ xOutput = xSFI->openFileWrite( aCurPath );
}
catch( Exception& )
- {}
+ {}
if( xOutput.is() )
{
@@ -790,7 +790,7 @@ BOOL DialogWindow::SaveDialog()
aURLObj.removeSegment();
::rtl::OUString aURL( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) );
sal_Bool bReadOnly = sal_False;
- ::rtl::OUString aComment( ::rtl::OUString::createFromAscii( "# " ) );
+ ::rtl::OUString aComment( ::rtl::OUString::createFromAscii( "# " ) );
aComment += aDialogName;
aComment += ::rtl::OUString::createFromAscii( " strings" );
Reference< task::XInteractionHandler > xDummyHandler;
@@ -833,9 +833,9 @@ BOOL DialogWindow::SaveDialog()
}
}
}
-
+
Reference< XStringResourceWithLocation > xStringResourceWithLocation =
- StringResourceWithLocation::create( xContext, aURL, bReadOnly,
+ StringResourceWithLocation::create( xContext, aURL, bReadOnly,
xStringResourceResolver->getDefaultLocale(), aDialogName, aComment, xDummyHandler );
// Add locales
@@ -896,7 +896,7 @@ std::vector< lang::Locale > implGetLanguagesOnlyContainedInFirstSeq
if( !bAlsoContainedInSecondSeq )
avRet.push_back( rFirstLocale );
}
-
+
return avRet;
}
@@ -1001,10 +1001,10 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen
Reference< XSimpleFileAccess > xSFI( xMSF->createInstance
( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY_THROW );
-
+
Reference< XInputStream > xInput;
if( xSFI->exists( aCurPath ) )
- xInput = xSFI->openFileRead( aCurPath );
+ xInput = xSFI->openFileRead( aCurPath );
Reference< XComponentContext > xContext;
Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY );
@@ -1045,7 +1045,7 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen
{
String aQueryBoxTitle( IDEResId( RID_STR_DLGIMP_CLASH_TITLE ) );
String aQueryBoxText( IDEResId( RID_STR_DLGIMP_CLASH_TEXT ) );
- aQueryBoxText.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "$(ARG1)" ) ), aXmlDlgName );
+ aQueryBoxText.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "$(ARG1)" ) ), aXmlDlgName );
NameClashQueryBox aQueryBox( pWin, aQueryBoxTitle, aQueryBoxText );
USHORT nRet = aQueryBox.Execute();
@@ -1066,7 +1066,7 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen
return bDone;
}
}
-
+
BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
if( pIDEShell == NULL )
{
@@ -1079,7 +1079,7 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen
Reference< task::XInteractionHandler > xDummyHandler;
bool bReadOnly = true;
Reference< XStringResourceWithLocation > xImportStringResource =
- StringResourceWithLocation::create( xContext, aBasePath, bReadOnly,
+ StringResourceWithLocation::create( xContext, aBasePath, bReadOnly,
aLocale, aXmlDlgName, ::rtl::OUString(), xDummyHandler );
Sequence< lang::Locale > aImportLocaleSeq = xImportStringResource->getLocales();
@@ -1247,7 +1247,7 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen
bDone = TRUE;
}
catch( Exception& )
- {}
+ {}
}
return bDone;
@@ -1265,7 +1265,7 @@ BOOL DialogWindow::ImportDialog()
DlgEdModel* DialogWindow::GetModel() const
{
- return pEditor ? pEditor->GetModel() : NULL;
+ return pEditor ? pEditor->GetModel() : NULL;
}
DlgEdPage* DialogWindow::GetPage() const
@@ -1329,7 +1329,7 @@ BOOL DialogWindow::IsPasteAllowed()
}
void DialogWindow::StoreData()
-{
+{
if ( IsModified() )
{
try
@@ -1339,7 +1339,7 @@ void DialogWindow::StoreData()
if( xLib.is() )
{
Reference< container::XNameContainer > xDialogModel = pEditor->GetDialog();
-
+
if( xDialogModel.is() )
{
Reference< XComponentContext > xContext;
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 8e83ec9..21ddf41 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.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
@@ -438,7 +438,7 @@ void __EXPORT BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
ModulWindow* pModWin = (ModulWindow*)pWin;
String aLibName = ( pModWin->GetLibName() );
ScriptDocument aDocument( pWin->GetDocument() );
-
+
if ( BasicIDE::RenameModule( pModWin, aDocument, aLibName, aOldName, aNewName ) )
{
bRenameOk = true;
@@ -447,14 +447,14 @@ void __EXPORT BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
// pWin has been invalidated, restore now
pWin = FindBasWin( aDocument, aLibName, aNewName, TRUE );
}
-
+
}
- else if ( pWin->IsA( TYPE( DialogWindow ) ) )
+ else if ( pWin->IsA( TYPE( DialogWindow ) ) )
{
DialogWindow* pDlgWin = (DialogWindow*)pWin;
bRenameOk = pDlgWin->RenameDialog( aNewName );
}
- if ( bRenameOk )
+ if ( bRenameOk )
{
BasicIDE::MarkDocumentModified( pWin->GetDocument() );
}
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index e434d1c..79d5956 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.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
@@ -99,7 +99,7 @@ public:
ContainerListenerImpl( BasicIDEShell* pShell ) : mpShell( pShell ) {}
- ~ContainerListenerImpl()
+ ~ContainerListenerImpl()
{
}
@@ -287,7 +287,7 @@ __EXPORT BasicIDEShell::~BasicIDEShell()
// Destroy all ContainerListeners for Basic Container.
if ( pListener )
pListener->removeContainerListener( m_aCurDocument, m_aCurLibName );
-
+
// MI: Das gab einen GPF im SDT beim Schliessen da dann der ViewFrame die
// ObjSh loslaesst. Es wusste auch keiner mehr wozu das gut war.
// GetViewFrame()->GetObjectShell()->Broadcast( SfxSimpleHint( SFX_HINT_DYING ) );
@@ -1013,7 +1013,7 @@ void BasicIDEShell::SetCurLib( const ScriptDocument& rDocument, String aLibName,
pListener->removeContainerListener( m_aCurDocument, m_aCurLibName );
m_aCurDocument = rDocument;
-
+
pListener->addContainerListener( m_aCurDocument, aLibName );
m_aCurLibName = aLibName;
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index ff0e3a1..cf86a6e 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.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
@@ -93,7 +93,7 @@ sal_Int32 ModuleInfoHelper::getModuleType( const uno::Reference< container::XNa
script::ModuleInfo aModuleInfo = xVBAModuleInfo->getModuleInfo( rModName );
nType = aModuleInfo.ModuleType;
}
- return nType;
+ return nType;
}
BasicEntry::~BasicEntry()
@@ -264,13 +264,13 @@ void BasicTreeListBox::ImpCreateLibEntries( SvLBoxEntry* pDocumentRootEntry, con
BOOL bModLibLoaded = FALSE;
::rtl::OUString aOULibName( aLibName );
Reference< script::XLibraryContainer > xModLibContainer( rDocument.getLibraryContainer( E_SCRIPTS ) );
- if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && xModLibContainer->isLibraryLoaded( aOULibName ) )
+ if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && xModLibContainer->isLibraryLoaded( aOULibName ) )
bModLibLoaded = TRUE;
// check, if the dialog library is loaded
BOOL bDlgLibLoaded = FALSE;
Reference< script::XLibraryContainer > xDlgLibContainer( rDocument.getLibraryContainer( E_DIALOGS ) );
- if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) && xDlgLibContainer->isLibraryLoaded( aOULibName ) )
+ if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) && xDlgLibContainer->isLibraryLoaded( aOULibName ) )
bDlgLibLoaded = TRUE;
BOOL bLoaded = bModLibLoaded || bDlgLibLoaded;
@@ -307,8 +307,8 @@ void BasicTreeListBox::ImpCreateLibEntries( SvLBoxEntry* pDocumentRootEntry, con
else
{
pLibRootEntry = AddEntry(
- aLibName,
- Image( IDEResId( nId ) ),
+ aLibName,
+ Image( IDEResId( nId ) ),
Image( IDEResId( nIdHC ) ),
pDocumentRootEntry, true,
std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_LIBRARY ) ) );
@@ -357,7 +357,7 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const
Sequence< ::rtl::OUString > aNames = BasicIDE::GetMethodNames( rDocument, rLibName, aModName );
sal_Int32 nCount = aNames.getLength();
const ::rtl::OUString* pNames = aNames.getConstArray();
-
+
for ( sal_Int32 j = 0 ; j < nCount ; j++ )
{
String aName = pNames[ j ];
@@ -378,7 +378,7 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const
{
DBG_UNHANDLED_EXCEPTION();
}
- }
+ }
}
// dialogs
@@ -418,7 +418,7 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const
void BasicTreeListBox::ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const String& rLibName )
{
-
+
::std::vector< std::pair< BasicEntryType, ::rtl::OUString > > aEntries;
aEntries.push_back( ::std::make_pair( OBJ_TYPE_DOCUMENT_OBJECTS, String( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) );
aEntries.push_back( ::std::make_pair( OBJ_TYPE_USERFORMS, String( IDEResId( RID_STR_USERFORMS ) ) ) );
@@ -542,7 +542,7 @@ SvLBoxEntry* BasicTreeListBox::ImpFindEntry( SvLBoxEntry* pParent, const String&
SvLBoxEntry* pEntry = pParent ? FirstChild( pParent ) : GetEntry( nRootPos );
while ( pEntry )
{
- if ( GetEntryText( pEntry ) == rText )
+ if ( GetEntryText( pEntry ) == rText )
return pEntry;
pEntry = pParent ? NextSibling( pEntry ) : GetEntry( ++nRootPos );
@@ -672,7 +672,7 @@ long BasicTreeListBox::ExpandingHdl()
::rtl::OUString aOULibName( aLibName );
Reference< script::XLibraryContainer > xModLibContainer( aDocument.getLibraryContainer( E_SCRIPTS ) );
if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) )
- {
+ {
Reference< script::XLibraryContainerPassword > xPasswd( xModLibContainer, UNO_QUERY );
if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( aOULibName ) && !xPasswd->isLibraryPasswordVerified( aOULibName ) )
{
@@ -699,7 +699,7 @@ BOOL BasicTreeListBox::IsEntryProtected( SvLBoxEntry* pEntry )
::rtl::OUString aOULibName( aDesc.GetLibName() );
Reference< script::XLibraryContainer > xModLibContainer( aDocument.getLibraryContainer( E_SCRIPTS ) );
if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) )
- {
+ {
Reference< script::XLibraryContainerPassword > xPasswd( xModLibContainer, UNO_QUERY );
if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( aOULibName ) && !xPasswd->isLibraryPasswordVerified( aOULibName ) )
{
@@ -711,7 +711,7 @@ BOOL BasicTreeListBox::IsEntryProtected( SvLBoxEntry* pEntry )
return bProtected;
}
-SvLBoxEntry* BasicTreeListBox::AddEntry(
+SvLBoxEntry* BasicTreeListBox::AddEntry(
const String& rText, const Image& rImage, const Image& rImageHC,
SvLBoxEntry* pParent, bool bChildrenOnDemand, std::auto_ptr< BasicEntry > aUserData )
{
@@ -766,12 +766,12 @@ void BasicTreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Ima
if ( xModuleConfig.is() )
{
Sequence< beans::PropertyValue > aModuleDescr;
- xModuleConfig->getByName( sModule ) >>= aModuleDescr;
+ xModuleConfig->getByName( sModule ) >>= aModuleDescr;
sal_Int32 nCount = aModuleDescr.getLength();
const beans::PropertyValue* pModuleDescr = aModuleDescr.getConstArray();
for ( sal_Int32 i = 0; i < nCount; ++i )
{
- if ( pModuleDescr[ i ].Name.equalsAsciiL(
+ if ( pModuleDescr[ i ].Name.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( "ooSetupFactoryEmptyDocumentURL" ) ) )
{
pModuleDescr[ i ].Value >>= sFactoryURL;
@@ -788,12 +788,12 @@ void BasicTreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Ima
if ( sFactoryURL.getLength() )
{
- rImage = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ),
- FALSE /* small */,
+ rImage = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ),
+ FALSE /* small */,
FALSE /* normal */ );
- rImageHC = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ),
- FALSE /* small */,
+ rImageHC = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ),
+ FALSE /* small */,
TRUE /* high contrast */ );
}
else
@@ -818,7 +818,7 @@ void BasicTreeListBox::SetCurrentEntry( BasicEntryDescriptor& rDesc )
{
aDesc = BasicEntryDescriptor(
ScriptDocument::getApplicationScriptDocument(),
- LIBRARY_LOCATION_USER, String::CreateFromAscii( "Standard" ),
+ LIBRARY_LOCATION_USER, String::CreateFromAscii( "Standard" ),
String(), String::CreateFromAscii( "." ), OBJ_TYPE_UNKNOWN );
}
ScriptDocument aDocument( aDesc.GetDocument() );
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index b12cc89..bd0259f 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.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
@@ -29,13 +29,13 @@
#include "precompiled_basctl.hxx"
#include <ide_pch.hxx>
-#include <basidesh.hxx>
+#include <basidesh.hxx>
#include <baside3.hxx>
#include <basobj.hxx>
#include <iderdll.hxx>
#include "dlged.hxx"
-#include <localizationmgr.hxx>
+#include <localizationmgr.hxx>
#include <com/sun/star/resource/XStringResourceSupplier.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
@@ -135,9 +135,9 @@ bool isLanguageDependentProperty( ::rtl::OUString aName )
pLangDepProp++;
}
return bRet;
-}
+}
//============================================
-
+
void LocalizationMgr::implEnableDisableResourceForAllLibraryDialogs( HandleResourceMode eMode )
{
Sequence< ::rtl::OUString > aDlgNames = m_aDocument.getObjectNames( E_DIALOGS, m_aLibName );
@@ -201,11 +201,11 @@ extern bool localesAreEqual( const ::com::sun::star::lang::Locale& rLocaleLeft,
const ::com::sun::star::lang::Locale& rLocaleRight );
// Works on xStringResourceManager's current language for SET_IDS/RESET_IDS,
-// anyway only one language should exist when calling this method then,
+// anyway only one language should exist when calling this method then,
// either the first one for mode SET_IDS or the last one for mode RESET_IDS
sal_Int32 LocalizationMgr::implHandleControlResourceProperties
( Any aControlAny, const ::rtl::OUString& aDialogName, const ::rtl::OUString& aCtrlName,
- Reference< XStringResourceManager > xStringResourceManager,
+ Reference< XStringResourceManager > xStringResourceManager,
Reference< XStringResourceResolver > xSourceStringResolver, HandleResourceMode eMode )
{
sal_Int32 nChangedCount = 0;
@@ -796,7 +796,7 @@ void LocalizationMgr::handleRemoveLocales( Sequence< Locale > aLocaleSeq )
handleTranslationbar();
}
- DBG_ASSERT( bConsistant,
+ DBG_ASSERT( bConsistant,
"LocalizationMgr::handleRemoveLocales(): sequence contains unsupported locales" );
}
@@ -889,7 +889,7 @@ DialogWindow* FindDialogWindowForEditor( DlgEditor* pEditor )
pWin = aIDEWindowTable.Next();
}
return pFoundDlgWin;
-}
+}
void LocalizationMgr::setControlResourceIDsForNewEditorObject( DlgEditor* pEditor,
@@ -920,7 +920,7 @@ void LocalizationMgr::setControlResourceIDsForNewEditorObject( DlgEditor* pEdito
if( nChangedCount )
BasicIDE::MarkDocumentModified( aDocument );
-}
+}
void LocalizationMgr::renameControlResourceIDsForEditorObject( DlgEditor* pEditor,
::com::sun::star::uno::Any aControlAny, const ::rtl::OUString& aNewCtrlName )
@@ -947,7 +947,7 @@ void LocalizationMgr::renameControlResourceIDsForEditorObject( DlgEditor* pEdito
implHandleControlResourceProperties
( aControlAny, aDialogName, aNewCtrlName, xStringResourceManager,
xDummyStringResolver, RENAME_CONTROL_IDS );
-}
+}
void LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject( DlgEditor* pEditor,
@@ -974,7 +974,7 @@ void LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject( DlgEditor*
if( nChangedCount )
BasicIDE::MarkDocumentModified( aDocument );
-}
+}
void LocalizationMgr::setStringResourceAtDialog( const ScriptDocument& rDocument, const String& aLibName,
const String& aDlgName, Reference< container::XNameContainer > xDialogModel )
@@ -1149,7 +1149,7 @@ void LocalizationMgr::copyResourcesForPastedEditorObject( DlgEditor* pEditor,
implHandleControlResourceProperties
( aControlAny, aDialogName, aCtrlName, xStringResourceManager,
xSourceStringResolver, MOVE_RESOURCES );
-}
+}
void LocalizationMgr::copyResourceForDroppedDialog( Reference< container::XNameContainer > xDialogModel,
const ::rtl::OUString& aDialogName, Reference< XStringResourceManager > xStringResourceManager,
@@ -1218,7 +1218,7 @@ Reference< XStringResourceManager > LocalizationMgr::getStringResourceFromDialog
Reference< resource::XStringResourceResolver >
xStringResourceResolver = xStringResourceSupplier->getStringResource();
- xStringResourceManager =
+ xStringResourceManager =
Reference< resource::XStringResourceManager >( xStringResourceResolver, UNO_QUERY );
}
}
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index f6c89a3..bc21f4b 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.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
@@ -87,7 +87,7 @@
#include <rtl/uri.hxx>
#include <rtl/bootstrap.hxx>
-
+
#include <osl/process.h>
#include <osl/file.hxx>
@@ -262,7 +262,7 @@ namespace basctl
getDocumentRef() const { return m_xDocument; }
/// returns a library container belonging to the document
- Reference< XLibraryContainer >
+ Reference< XLibraryContainer >
getLibraryContainer( LibraryContainerType _eType ) const;
/// determines whether a given library is part of the shared installation
@@ -460,7 +460,7 @@ namespace basctl
if ( xVBACompat.is() )
bResult = xVBACompat->getVBACompatibilityMode();
}
- return bResult;
+ return bResult;
}
//--------------------------------------------------------------------
@@ -653,7 +653,7 @@ namespace basctl
try
{
Reference< XNameContainer > xLib( getLibrary( _eType, _rLibName, TRUE ), UNO_QUERY_THROW );
-
+
// get element
Any aElement( xLib->getByName( _rOldName ) );
@@ -1018,7 +1018,7 @@ namespace basctl
::rtl::OUString aSearchURL3( RTL_CONSTASCII_USTRINGPARAM( "share/extensions" ) );
if( aCanonicalFileURL.indexOf( aSearchURL1 ) != -1 ||
aCanonicalFileURL.indexOf( aSearchURL2 ) != -1 ||
- aCanonicalFileURL.indexOf( aSearchURL3 ) != -1 )
+ aCanonicalFileURL.indexOf( aSearchURL3 ) != -1 )
bIsShared = true;
}
}
@@ -1128,7 +1128,7 @@ namespace basctl
ScriptDocument::~ScriptDocument()
{
}
-
+
//--------------------------------------------------------------------
const ScriptDocument& ScriptDocument::getApplicationScriptDocument()
{
@@ -1253,7 +1253,7 @@ namespace basctl
return aScriptDocs;
}
-
+
//--------------------------------------------------------------------
bool ScriptDocument::operator==( const ScriptDocument& _rhs ) const
{
@@ -1283,7 +1283,7 @@ namespace basctl
{
return m_pImpl->getLibraryContainer( _eType );
}
-
+
//--------------------------------------------------------------------
Reference< XNameContainer > ScriptDocument::getLibrary( LibraryContainerType _eType, const ::rtl::OUString& _rLibName, bool _bLoadLibrary ) const
SAL_THROW((NoSuchElementException))
diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx
index a37331c..ab61423 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.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/dlged.cxx b/basctl/source/dlged/dlged.cxx
index bfb682e..f786c11 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>
@@ -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 );
@@ -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;
@@ -1106,7 +1106,7 @@ void DlgEditor::Paste()
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 );
}
diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx
index 39531f2..aeeb69a 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
@@ -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);
@@ -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);
@@ -169,25 +169,25 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
} 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/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index a041c8e..094a5fe 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
@@ -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 ) ) ),
More information about the Libreoffice-commits
mailing list