subject:"\[Libreoffice\-commits\] .\: basctl\/source"

[Libreoffice-commits] .: basctl/source tools/Library_tl.mk tools/Package_inc.mk tools/inc tools/source

2012-04-18 Thread Michael Stahl

 basctl/source/basicide/baside2.hxx |2 
 tools/Library_tl.mk|1 
 tools/Package_inc.mk   |1 
 tools/inc/tools/table.hxx  |  148 ---
 tools/source/memtools/table.cxx|  358 -
 5 files changed, 510 deletions(-)

New commits:
commit d85b7f1548cbf0091812fcec1f9a37e1220de4a9
Author: Michael Stahl mst...@redhat.com
Date:   Wed Apr 18 16:51:56 2012 +0200

move tools/table.hxx to binfilter

diff --git a/basctl/source/basicide/baside2.hxx 
b/basctl/source/basicide/baside2.hxx
index a274eec..bae4730 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -57,8 +57,6 @@ class SvxSearchItem;
 #include objdlg.hxx
 #include set
 
-#include tools/table.hxx
-
 DBG_NAMEEX( ModulWindow )
 
 #define MARKER_NOMARKER 0x
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 2571031..975574f 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -88,7 +88,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
 tools/source/memtools/contnr \
 tools/source/memtools/mempool \
 tools/source/memtools/multisel \
-tools/source/memtools/table \
 tools/source/memtools/unqidx \
 tools/source/misc/appendunixshellword \
 tools/source/misc/extendapplicationenvironment \
diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk
index b4765f9..46b829f 100644
--- a/tools/Package_inc.mk
+++ b/tools/Package_inc.mk
@@ -83,7 +83,6 @@ $(eval $(call 
gb_Package_add_file,tools_inc,inc/tools/stream.hxx,tools/stream.hx
 $(eval $(call 
gb_Package_add_file,tools_inc,inc/tools/string.hxx,tools/string.hxx))
 $(eval $(call 
gb_Package_add_file,tools_inc,inc/tools/svborder.hxx,tools/svborder.hxx))
 $(eval $(call 
gb_Package_add_file,tools_inc,inc/tools/svlibrary.hxx,tools/svlibrary.hxx))
-$(eval $(call 
gb_Package_add_file,tools_inc,inc/tools/table.hxx,tools/table.hxx))
 $(eval $(call 
gb_Package_add_file,tools_inc,inc/tools/tempfile.hxx,tools/tempfile.hxx))
 $(eval $(call 
gb_Package_add_file,tools_inc,inc/tools/tenccvt.hxx,tools/tenccvt.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/time.hxx,tools/time.hxx))
diff --git a/tools/inc/tools/table.hxx b/tools/inc/tools/table.hxx
deleted file mode 100644
index ec6927e..000
--- a/tools/inc/tools/table.hxx
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-#ifndef _TOOLS_TABLE_HXX
-#define _TOOLS_TABLE_HXX
-
-#include tools/toolsdllapi.h
-#include tools/solar.h
-#include tools/contnr.hxx
-
-// -
-// - Table -
-// -
-
-#define TABLE_ENTRY_NOTFOUND   CONTAINER_ENTRY_NOTFOUND
-
-class TOOLS_DLLPUBLIC Table : private Container
-{
-private:
-sal_uIntPtr nCount;
-TOOLS_DLLPRIVATE sal_uIntPtrImplGetIndex( sal_uIntPtr nKey, 
sal_uIntPtr* pIndex = NULL ) const;
-public:
-Table( sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16 );
-Table( const Table rTable ) : Container( rTable )
-{ nCount = rTable.nCount; }
-
-sal_BoolInsert( sal_uIntPtr nKey, void* p );
-void*   Remove( sal_uIntPtr nKey );
-void*   Replace( sal_uIntPtr nKey, void* p );
-void*   Get( sal_uIntPtr nKey ) const;
-
-voidClear() { Container::Clear(); nCount = 0; }
-sal_uIntPtr Count() const { return( nCount ); }
-
-void*   GetCurObject() const;
-sal_uIntPtr GetCurKey() const { return 
(sal_uIntPtr)Container::GetCurObject(); }
-sal_uIntPtr GetKey( const void* p ) const;
-sal_BoolIsKeyValid( sal_uIntPtr nKey ) const;
-
-void*   GetObject( sal_uIntPtr nPos ) const
-{ return Container::GetObject( (nPos*2)+1 ); }
-sal_uIntPtr GetObjectKey( sal_uIntPtr nPos ) const
-{ return

[Libreoffice-commits] .: basctl/source

2012-04-16 Thread Julien Nabet

 basctl/source/basicide/basidesh.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8bfee2c0eb6fcec49d05562bf1cb945356a4180e
Author: Julien Nabet serval2...@yahoo.fr
Date:   Mon Apr 16 21:14:57 2012 +0200

Resolves: fdo#48368 CRASH closing IDE

diff --git a/basctl/source/basicide/basidesh.cxx 
b/basctl/source/basicide/basidesh.cxx
index e4dcd98..02e10c2 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -417,9 +417,9 @@ sal_uInt16 BasicIDEShell::PrepareClose( sal_Bool bUI, 
sal_Bool bForBrowsing )
 else
 {
 sal_Bool bCanClose = sal_True;
-for ( sal_uLong nWin = 0; bCanClose  ( nWin  aIDEWindowTable.size() 
); nWin++ )
+for (IDEWindowTable::const_iterator it = aIDEWindowTable.begin(); 
bCanClose  (it != aIDEWindowTable.end()); ++it)
 {
-IDEBaseWindow* pWin = aIDEWindowTable[ nWin ];
+IDEBaseWindow* pWin = it-second;
 if ( !pWin-CanClose() )
 {
 if ( !m_aCurLibName.isEmpty()  ( pWin-IsDocument( 
m_aCurDocument ) || pWin-GetLibName() != m_aCurLibName ) )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2012-03-29 Thread Markus Mohrhard

 basctl/source/basicide/baside2.hxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit da2c7a91adc46ed01167b9b582d6cd65fac5e982
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Mar 29 21:21:32 2012 +0200

add missing tools/table.hxx include

diff --git a/basctl/source/basicide/baside2.hxx 
b/basctl/source/basicide/baside2.hxx
index 2267914..922be10 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -56,6 +56,8 @@ class SvxSearchItem;
 #include linenumberwindow.hxx
 #include objdlg.hxx
 
+#include tools/table.hxx
+
 DBG_NAMEEX( ModulWindow )
 
 #define MARKER_NOMARKER 0x
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2012-03-22 Thread Stephan Bergmann

 basctl/source/basicide/basides1.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit a603634f3539d472b66f71419f02a14260dcaf5b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Mar 22 08:12:08 2012 +0100

Fixed previous commit for --enable-dbgutil mode

diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index d0c9fba..6702f93 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -465,7 +465,6 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest rReq )
 DBG_ASSERT( rReq.GetArgs(), arguments expected );
 const SfxUInt16Item rTabId = (const 
SfxUInt16Item)rReq.GetArgs()-Get(SID_BASICIDE_ARG_TABID );
 const SfxStringItem rModName = (const 
SfxStringItem)rReq.GetArgs()-Get(SID_BASICIDE_ARG_MODULENAME );
-DBG_ASSERT( pWin, Window nicht im Liste, aber in TabBar ? );
 if ( aIDEWindowTable.find( rTabId.GetValue() ) !=  
aIDEWindowTable.end() )
 {
 IDEBaseWindow* pWin = aIDEWindowTable[ rTabId.GetValue() ];
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2012-03-22 Thread Fridrich Strba

 basctl/source/basicide/basides1.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0589dd3fb5c5bf2fdcdbccfab31fbe26c0a9727d
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Mar 22 09:22:42 2012 +0100

fix debug build

diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index 6702f93..d9f5b63 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -468,6 +468,7 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest rReq )
 if ( aIDEWindowTable.find( rTabId.GetValue() ) !=  
aIDEWindowTable.end() )
 {
 IDEBaseWindow* pWin = aIDEWindowTable[ rTabId.GetValue() ];
+DBG_ASSERT( pWin, Window nicht im Liste, aber in TabBar ? );
 ::rtl::OUString aNewName( rModName.GetValue() );
 ::rtl::OUString aOldName( pWin-GetName() );
 if ( aNewName != aOldName )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2012-03-22 Thread Fridrich Strba

 basctl/source/basicide/basides1.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 0a8596dd8ebbbc80e87d4bdfafe3cf53355b7d43
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Mar 22 14:46:02 2012 +0100

Revert fix debug build

This reverts commit 0589dd3fb5c5bf2fdcdbccfab31fbe26c0a9727d.

Given the find above, this assert will never be triggered anyway

diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index d9f5b63..6702f93 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -468,7 +468,6 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest rReq )
 if ( aIDEWindowTable.find( rTabId.GetValue() ) !=  
aIDEWindowTable.end() )
 {
 IDEBaseWindow* pWin = aIDEWindowTable[ rTabId.GetValue() ];
-DBG_ASSERT( pWin, Window nicht im Liste, aber in TabBar ? );
 ::rtl::OUString aNewName( rModName.GetValue() );
 ::rtl::OUString aOldName( pWin-GetName() );
 if ( aNewName != aOldName )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2012-03-21 Thread Fridrich Strba

 basctl/source/basicide/basides1.cxx|   54 +++--
 basctl/source/basicide/basides2.cxx|   20 ++--
 basctl/source/basicide/basides3.cxx|   27 --
 basctl/source/basicide/basidesh.cxx|  117 +++--
 basctl/source/basicide/basobj2.cxx |2 
 basctl/source/basicide/basobj3.cxx |7 -
 basctl/source/basicide/bastypes.cxx|8 -
 basctl/source/basicide/localizationmgr.cxx |5 -
 basctl/source/inc/basidesh.hxx |7 -
 9 files changed, 137 insertions(+), 110 deletions(-)

New commits:
commit 000bb6af72e934d7f0fd2291cea919437cfd5e2f
Author: Noel Grandin n...@peralex.com
Date:   Tue Mar 20 10:03:56 2012 +0200

Convert tools/table.hxx usage to std::map in Basic IDE module

diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index d78f43a..d0c9fba 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -146,6 +146,7 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest rReq )
 DBG_ASSERT( nWhich, Wich fuer SearchItem ? );
 const SfxPoolItem rItem = pArgs-Get( nWhich );
 DBG_ASSERT( rItem.ISA( SvxSearchItem ), Kein Searchitem! );
+IDEWindowTable::const_iterator it;
 if ( rItem.ISA( SvxSearchItem ) )
 {
 // memorize item because of the adjustments...
@@ -155,22 +156,20 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest rReq )
 if ( ((const SvxSearchItem)rItem).GetCommand() == 
SVX_SEARCHCMD_REPLACE_ALL )
 {
 sal_uInt16 nActModWindows = 0;
-IDEBaseWindow* pWin = aIDEWindowTable.First();
-while ( pWin )
+for( it = aIDEWindowTable.begin(); it != 
aIDEWindowTable.end(); ++it )
 {
+IDEBaseWindow* pWin = it-second;
 if ( !pWin-IsSuspended()  pWin-IsA( TYPE( 
ModulWindow ) ) )
 nActModWindows++;
-pWin = aIDEWindowTable.Next();
 }
 
 if ( ( nActModWindows = 1 ) || ( !((const 
SvxSearchItem)rItem).GetSelection()  QueryBox( pCurWin, 
WB_YES_NO|WB_DEF_YES, String( IDEResId( RID_STR_SEARCHALLMODULES ) ) 
).Execute() == RET_YES ) )
 {
-pWin = aIDEWindowTable.First();
-while ( pWin )
+for( it = aIDEWindowTable.begin(); it != 
aIDEWindowTable.end(); ++it )
 {
+IDEBaseWindow* pWin = it-second;
 if ( !pWin-IsSuspended()  pWin-IsA( TYPE( 
ModulWindow ) ) )
 nFound = nFound + 
((ModulWindow*)pWin)-StartSearchAndReplace( (const SvxSearchItem)rItem );
-pWin = aIDEWindowTable.Next();
 }
 }
 else
@@ -187,8 +186,15 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest rReq )
 {
 // search other modules...
 sal_Bool bChangeCurWindow = sal_False;
-aIDEWindowTable.Seek( pCurWin );
-IDEBaseWindow* pWin = aIDEWindowTable.Next();
+for( it = aIDEWindowTable.begin(); it != 
aIDEWindowTable.end(); ++it )
+if ( it-second == pCurWin)
+break;
+if ( it != aIDEWindowTable.end() )
+++it;
+IDEBaseWindow* pWin = NULL;
+if ( it != aIDEWindowTable.end() )
+pWin = it-second;
+
 sal_Bool bSearchedFromStart = sal_False;
 while ( !nFound  !bCanceled  ( pWin || 
!bSearchedFromStart ) )
 {
@@ -200,7 +206,9 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest rReq )
 QueryBox aQuery(pParent, 
WB_YES_NO|WB_DEF_YES, ResId::toString(IDEResId(RID_STR_SEARCHFROMSTART)));
 if ( aQuery.Execute() == RET_YES )
 {
-pWin = aIDEWindowTable.First();
+it = aIDEWindowTable.begin();
+if ( it != aIDEWindowTable.end() )
+pWin = it-second;
 bSearchedFromStart = sal_True;
 }
 else
@@ -222,7 +230,11 @@ void

[Libreoffice-commits] .: basctl/source

2012-02-13 Thread Andras Timar

 basctl/source/basicide/baside2b.cxx |   38 +++-
 1 file changed, 21 insertions(+), 17 deletions(-)

New commits:
commit 1f0784d2b877910b4a8ba3ed599333b5000ef7d0
Author: Tomcsik Bence tomcsikbe...@gmail.com
Date:   Mon Feb 13 16:06:03 2012 +0100

Wrong size of 'Remove watch' button at Basic IDE. fdo#44237

This patch resize the nVirtToolBoxHeight in WatchWindow::WatchWindow if
the aRemoveWatchButton plus some space is higher than nVirtToolBoxHeight. So
the aRemoveWatchButton doesn't go into aHeaderBar.

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index f74e134..d42a407 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1200,7 +1200,28 @@ WatchWindow::WatchWindow( Window* pParent ) :
 aXEdit.SetAccessibleName(String(IDEResId( RID_STR_WATCHNAME)));
 aTreeListBox.SetAccessibleName(String(IDEResId(RID_STR_WATCHNAME)));
 
+long nTextLen = GetTextWidth( aWatchStr ) + DWBORDER + 3;
+aXEdit.SetPosPixel( Point( nTextLen, 3 ) );
+aXEdit.SetAccHdl( LINK( this, WatchWindow, EditAccHdl ) );
+aXEdit.GetAccelerator().InsertItem( 1, KeyCode( KEY_RETURN ) );
+aXEdit.GetAccelerator().InsertItem( 2, KeyCode( KEY_ESCAPE ) );
+aXEdit.Show();
+
+aRemoveWatchButton.Disable();
+aRemoveWatchButton.SetClickHdl( LINK( this, WatchWindow, ButtonHdl ) );
+aRemoveWatchButton.SetPosPixel( Point( nTextLen + 
aXEdit.GetSizePixel().Width() + 4, 2 ) );
+Size aSz( aRemoveWatchButton.GetModeImage().GetSizePixel() );
+aSz.Width() += 6;
+aSz.Height() += 6;
+aRemoveWatchButton.SetSizePixel( aSz );
+aRemoveWatchButton.Show();
+
+long nRWBtnSize = 
aRemoveWatchButton.GetModeImage().GetSizePixel().Height() + 10;
 nVirtToolBoxHeight = aXEdit.GetSizePixel().Height() + 7;
+
+if ( nRWBtnSize  nVirtToolBoxHeight )
+nVirtToolBoxHeight = nRWBtnSize;
+
 nHeaderBarHeight = 16;
 
 aTreeListBox.SetHelpId(HID_BASICIDE_WATCHWINDOW_LIST);
@@ -1232,25 +1253,8 @@ WatchWindow::WatchWindow( Window* pParent ) :
 
 aHeaderBar.Show();
 
-aRemoveWatchButton.Disable();
-
 aTreeListBox.Show();
 
-long nTextLen = GetTextWidth( aWatchStr ) + DWBORDER;
-aXEdit.SetPosPixel( Point( nTextLen, 3 ) );
-aXEdit.SetAccHdl( LINK( this, WatchWindow, EditAccHdl ) );
-aXEdit.GetAccelerator().InsertItem( 1, KeyCode( KEY_RETURN ) );
-aXEdit.GetAccelerator().InsertItem( 2, KeyCode( KEY_ESCAPE ) );
-aXEdit.Show();
-
-aRemoveWatchButton.SetClickHdl( LINK( this, WatchWindow, ButtonHdl ) );
-aRemoveWatchButton.SetPosPixel( Point( nTextLen + 
aXEdit.GetSizePixel().Width() + 4, 2 ) );
-Size aSz( aRemoveWatchButton.GetModeImage().GetSizePixel() );
-aSz.Width() += 6;
-aSz.Height() += 6;
-aRemoveWatchButton.SetSizePixel( aSz );
-aRemoveWatchButton.Show();
-
 SetText( String( IDEResId( RID_STR_WATCHNAME ) ) );
 
 SetHelpId( HID_BASICIDE_WATCHWINDOW );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source dbaccess/source sw/source

2012-01-30 Thread Michael Meeks

 basctl/source/basicide/baside2b.cxx|4 ++--
 dbaccess/source/ui/control/sqledit.cxx |4 ++--
 sw/source/ui/docvw/srcedtw.cxx |4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a1275f841a1ca601cadd2e6ec130af0703a328e5
Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com
Date:   Sun Jan 29 18:20:29 2012 +0700

use SAL_CALL - fix bulid in msvc

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 107c853..a1f0766 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -158,13 +158,13 @@ public:
 private:
 virtual ~ChangesListener() {}
 
-virtual void disposing(lang::EventObject const ) throw (RuntimeException)
+virtual void SAL_CALL disposing(lang::EventObject const ) throw 
(RuntimeException)
 {
 osl::MutexGuard g(editor_.mutex_);
 editor_.notifier_.clear();
 }
 
-virtual void propertiesChange(
+virtual void SAL_CALL propertiesChange(
 Sequence beans::PropertyChangeEvent  const ) throw 
(RuntimeException)
 {
 SolarMutexGuard g;
diff --git a/dbaccess/source/ui/control/sqledit.cxx 
b/dbaccess/source/ui/control/sqledit.cxx
index 4fe5224..5a47883 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -66,14 +66,14 @@ public:
 private:
 virtual ~ChangesListener() {}
 
-virtual void disposing(css::lang::EventObject const )
+virtual void SAL_CALL disposing(css::lang::EventObject const )
 throw (css::uno::RuntimeException)
 {
 osl::MutexGuard g(editor_.m_mutex);
 editor_.m_notifier.clear();
 }
 
-virtual void propertiesChange(
+virtual void SAL_CALL propertiesChange(
 css::uno::Sequence css::beans::PropertyChangeEvent  const )
 throw (css::uno::RuntimeException)
 {
diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx
index 07c1c81..91dbf07 100644
--- a/sw/source/ui/docvw/srcedtw.cxx
+++ b/sw/source/ui/docvw/srcedtw.cxx
@@ -231,14 +231,14 @@ public:
 private:
 virtual ~ChangesListener() {}
 
-virtual void disposing(css::lang::EventObject const )
+virtual void SAL_CALL disposing(css::lang::EventObject const )
 throw (css::uno::RuntimeException)
 {
 osl::MutexGuard g(editor_.mutex_);
 editor_.notifier_.clear();
 }
 
-virtual void propertiesChange(
+virtual void SAL_CALL propertiesChange(
 css::uno::Sequence css::beans::PropertyChangeEvent  const )
 throw (css::uno::RuntimeException)
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source basic/source sc/source sw/source

2012-01-25 Thread Takeshi Abe

 basctl/source/dlged/managelang.cxx |3 +--
 basctl/source/dlged/propbrw.cxx|3 +--
 basic/source/classes/sbxmod.cxx|   11 ---
 basic/source/sbx/sbxbase.cxx   |3 +--
 sc/source/core/data/column.cxx |2 +-
 sc/source/core/data/documen3.cxx   |3 +--
 sc/source/core/data/table4.cxx |3 +--
 sw/source/core/text/itrform2.cxx   |3 +--
 sw/source/core/txtnode/atrfld.cxx  |3 +--
 sw/source/ui/docvw/edtwin.cxx  |8 ++--
 10 files changed, 14 insertions(+), 28 deletions(-)

New commits:
commit bb51e8e72be424f0fd92350006c536a97fd4b210
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Thu Jan 26 01:02:30 2012 +0900

Deleting a null pointer is safe

diff --git a/basctl/source/dlged/managelang.cxx 
b/basctl/source/dlged/managelang.cxx
index eb16d60..58fd948 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -197,8 +197,7 @@ void ManageLanguageDialog::ClearLanguageBox()
 for ( i = 0; i  nCount; ++i )
 {
 LanguageEntry* pEntry = (LanguageEntry*)( 
m_aLanguageLB.GetEntryData(i) );
-if ( pEntry )
-delete pEntry;
+delete pEntry;
 }
 m_aLanguageLB.Clear();
 }
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index 5ee9c28..4e1f90f 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -308,8 +308,7 @@ Sequence Reference XInterface  
 // next element
 pCurrent = pGroupIterator  pGroupIterator-IsMore() ? 
pGroupIterator-Next() : NULL;
 }
-if (pGroupIterator)
-delete pGroupIterator;
+delete pGroupIterator;
 }
 
 sal_Int32 nCount = aInterfaces.size();
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index d61b63c..40ae0d7 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -541,13 +541,10 @@ SbModule::SbModule( const String rName,  sal_Bool 
bVBACompat )
 SbModule::~SbModule()
 {
 OSL_TRACE(Module named %s is destructing, rtl::OUStringToOString( 
GetName(), RTL_TEXTENCODING_UTF8 ).getStr() );
-if( pImage )
-delete pImage;
-if( pBreaks )
-delete pBreaks;
-if( pClassData )
-delete pClassData;
-mxWrapper = NULL;
+delete pImage;
+delete pBreaks;
+delete pClassData;
+mxWrapper = NULL;
 }
 
 uno::Reference script::XInvocation 
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index 303f382..e2987d0 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -55,8 +55,7 @@ SbxAppData GetSbxData_Impl()
 
 SbxAppData::~SbxAppData()
 {
-if( pBasicFormater )
-delete pBasicFormater;
+delete pBasicFormater;
 }
 
 
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 6c1c849..50f0e95 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -93,7 +93,7 @@ ScColumn::ScColumn() :
 ScColumn::~ScColumn()
 {
 FreeAll();
-if (pAttrArray) delete pAttrArray;
+delete pAttrArray;
 }
 
 
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 66973de..991eb6b 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -273,8 +273,7 @@ void ScDocument::SetDBCollection( ScDBCollection* 
pNewDBCollection, bool bRemove
 }
 }
 
-if (pDBCollection)
-delete pDBCollection;
+delete pDBCollection;
 
 pDBCollection = pNewDBCollection;
 }
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index bc99c5c..dac4111 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -564,8 +564,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2,
 {
 if ( bGetPattern )
 {
-if ( pNewPattern )
-delete pNewPattern;
+delete pNewPattern;
 if (bVertical)  // rInner:=nRow, rOuter:=nCol
 pSrcPattern = 
aCol[nCol].GetPattern(static_castSCROW(nAtSrc));
 else// rInner:=nCol, rOuter:=nRow
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 54a7825..b46d5b8 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1629,8 +1629,7 @@ xub_StrLen SwTxtFormatter::FormatLine( const xub_StrLen 
nStartPos )
 GetInfo().GetParaPortion()-GetReformat()-LeftMove( GetInfo().GetIdx() );
 
 // delete master copy of rest portion
-if ( pSaveFld )
-delete pSaveFld;
+delete pSaveFld;
 
 xub_StrLen nNewStart = nStartPos + pCurr-GetLen();
 
diff --git a/sw/source/core/txtnode/atrfld.cxx 
b/sw/source/core/txtnode/atrfld.cxx
index 4789c5f..dc285ef 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -134,8 +134,7 @@ void

[Libreoffice-commits] .: basctl/source

2011-12-20 Thread August Sodora

 basctl/source/basicide/moduldlg.cxx |   41 
 basctl/source/basicide/moduldlg.hxx |6 ++---
 2 files changed, 22 insertions(+), 25 deletions(-)

New commits:
commit b0aac3f446f95080cbcac8e2f011dd56be1bacdd
Author: August Sodora aug...@gmail.com
Date:   Tue Dec 20 00:59:11 2011 -0500

String-OUString

diff --git a/basctl/source/basicide/moduldlg.cxx 
b/basctl/source/basicide/moduldlg.cxx
index 954f016..657c3c8 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -732,7 +732,7 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton )
 return 0;
 }
 
-bool ObjectPage::GetSelection( ScriptDocument rDocument, String rLibName )
+bool ObjectPage::GetSelection( ScriptDocument rDocument, ::rtl::OUString 
rLibName )
 {
 bool bRet = false;
 
@@ -740,8 +740,8 @@ bool ObjectPage::GetSelection( ScriptDocument rDocument, 
String rLibName )
 BasicEntryDescriptor aDesc( aBasicBox.GetEntryDescriptor( pCurEntry ) );
 rDocument = aDesc.GetDocument();
 rLibName = aDesc.GetLibName();
-if ( !rLibName.Len() )
-rLibName = String::CreateFromAscii( Standard );
+if ( rLibName.isEmpty() )
+rLibName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Standard));
 
 DBG_ASSERT( rDocument.isAlive(), ObjectPage::GetSelection: no or dead 
ScriptDocument in the selection! );
 if ( !rDocument.isAlive() )
@@ -784,11 +784,11 @@ bool ObjectPage::GetSelection( ScriptDocument rDocument, 
String rLibName )
 void ObjectPage::NewModule()
 {
 ScriptDocument aDocument( ScriptDocument::getApplicationScriptDocument() );
-String aLibName;
+::rtl::OUString aLibName;
 
 if ( GetSelection( aDocument, aLibName ) )
 {
-String aModName;
+::rtl::OUString aModName;
 createModImpl( static_castWindow*( this ), aDocument,
 aBasicBox, aLibName, aModName, true );
 }
@@ -797,7 +797,7 @@ void ObjectPage::NewModule()
 void ObjectPage::NewDialog()
 {
 ScriptDocument aDocument( ScriptDocument::getApplicationScriptDocument() );
-String aLibName;
+::rtl::OUString aLibName;
 
 if ( GetSelection( aDocument, aLibName ) )
 {
@@ -809,14 +809,14 @@ void ObjectPage::NewDialog()
 
 if (xNewDlg-Execute() != 0)
 {
-String aDlgName( xNewDlg-GetObjectName() );
-if (aDlgName.Len() == 0)
+::rtl::OUString aDlgName( xNewDlg-GetObjectName() );
+if (aDlgName.isEmpty())
 aDlgName = aDocument.createObjectName( E_DIALOGS, aLibName);
 
 if ( aDocument.hasDialog( aLibName, aDlgName ) )
 {
 ErrorBox( this, WB_OK | WB_DEF_OK,
-String( IDEResId( RID_STR_SBXNAMEALLREADYUSED2 ) ) 
).Execute();
+  ResId::toString( IDEResId( 
RID_STR_SBXNAMEALLREADYUSED2 ) ) ).Execute();
 }
 else
 {
@@ -933,7 +933,7 @@ LibDialog::LibDialog( Window* pParent )
 aReferenceBox(  this, IDEResId( RID_CB_REF ) ),
 aReplaceBox(this, IDEResId( RID_CB_REPL ) )
 {
-SetText( String( IDEResId( RID_STR_APPENDLIBS ) ) );
+SetText( ResId::toString( IDEResId( RID_STR_APPENDLIBS ) ) );
 FreeResource();
 }
 
@@ -942,16 +942,16 @@ LibDialog::~LibDialog()
 {
 }
 
-void LibDialog::SetStorageName( const String rName )
+void LibDialog::SetStorageName( const ::rtl::OUString rName )
 {
-String aName( IDEResId( RID_STR_FILENAME ) );
+::rtl::OUString aName( ResId::toString( IDEResId( RID_STR_FILENAME ) ) );
 aName += rName;
 aStorageName.SetText( aName );
 }
 
 // Helper function
 SbModule* createModImpl( Window* pWin, const ScriptDocument rDocument,
-BasicTreeListBox rBasicBox, const String rLibName, String aModName, bool 
bMain )
+BasicTreeListBox rBasicBox, const ::rtl::OUString rLibName, 
::rtl::OUString aModName, bool bMain )
 {
 OSL_ENSURE( rDocument.isAlive(), createModImpl: invalid document! );
 if ( !rDocument.isAlive() )
@@ -959,11 +959,11 @@ SbModule* createModImpl( Window* pWin, const 
ScriptDocument rDocument,
 
 SbModule* pModule = NULL;
 
-String aLibName( rLibName );
-if ( !aLibName.Len() )
-aLibName = String::CreateFromAscii( Standard );
+::rtl::OUString aLibName( rLibName );
+if ( aLibName.isEmpty() )
+aLibName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Standard));
 rDocument.getOrCreateLibrary( E_SCRIPTS, aLibName );
-if ( !aModName.Len() )
+if ( aModName.isEmpty() )
 aModName = rDocument.createObjectName( E_SCRIPTS, aLibName );
 
 boost::scoped_ptr NewObjectDialog  xNewDlg(
@@ -1011,7 +1011,7 @@ SbModule* createModImpl( Window* pWin, const 
ScriptDocument rDocument,
 if( pBasic  rDocument.isInVBAMode() )
 {
 // add the new module in the Modules entry
-SvLBoxEntry* pLibSubEntry = rBasicBox.FindEntry(

[Libreoffice-commits] .: basctl/source

2011-12-15 Thread Noel Power

 basctl/source/basicide/scriptdocument.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f269629d1b0182d89b2f5a769fbb0f8dcb815ec3
Author: Noel Power noel.po...@novell.com
Date:   Thu Dec 15 15:13:04 2011 +

fix mistaken String::CreateFromInt32 - OUString::valueOf conversion

diff --git a/basctl/source/basicide/scriptdocument.cxx 
b/basctl/source/basicide/scriptdocument.cxx
index e75affa..a194029 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -1311,7 +1311,7 @@ namespace basctl
 ::std::insert_iterator ::std::set ::rtl::OUString  ( 
aUsedNamesCheck, aUsedNamesCheck.begin() ) );
 
 bool bValid = false;
-sal_uInt16 i = 1;
+sal_Int32 i = 1;
 while ( !bValid )
 {
 aObjectName = aBaseName;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2011-12-10 Thread Ivan Timofeev

 basctl/source/basicide/basicrenderable.cxx |4 ++--
 basctl/source/basicide/baside2.cxx |2 +-
 basctl/source/basicide/bastype2.cxx|2 +-
 basctl/source/basicide/localizationmgr.cxx |6 +++---
 basctl/source/basicide/moduldl2.cxx|2 +-
 basctl/source/basicide/scriptdocument.cxx  |6 +++---
 basctl/source/dlged/dlgedobj.cxx   |2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 1688a9d9235dd2ee4f3b9497308efd41f7a3fb6f
Author: Olivier Hallot olivier.hal...@alta.org.br
Date:   Fri Dec 9 22:23:22 2011 -0200

Fix for fdo43460 Part II getLength to isEmpty

Part II
Module
basctl

diff --git a/basctl/source/basicide/basicrenderable.cxx 
b/basctl/source/basicide/basicrenderable.cxx
index 1da202f..d2de323 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -120,7 +120,7 @@ sal_Int32 SAL_CALL BasicRenderable::getRendererCount (
 if( nContent == 1 )
 {
 rtl::OUString aPageRange( getStringValue( PageRange ) );
-if( aPageRange.getLength() )
+if( !aPageRange.isEmpty() )
 {
 StringRangeEnumerator aRangeEnum( aPageRange, 0, nCount-1 
);
 sal_Int32 nSelCount = aRangeEnum.size();
@@ -179,7 +179,7 @@ void SAL_CALL BasicRenderable::render (
 if( nContent == 1 )
 {
 rtl::OUString aPageRange( getStringValue( PageRange ) );
-if( aPageRange.getLength() )
+if( !aPageRange.isEmpty() )
 {
 sal_Int32 nPageCount = mpWindow-countPages( pPrinter );
 StringRangeEnumerator aRangeEnum( aPageRange, 0, 
nPageCount-1 );
diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index d1a1589..cf245ca 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -341,7 +341,7 @@ sal_Bool ModulWindow::BasicExecute()
 if ( !pMethod )
 {
 // If not in a method then prompt the user
-return ( BasicIDE::ChooseMacro( uno::Reference frame::XModel 
(), sal_False, rtl::OUString() ).getLength()  0 ) ? sal_True : sal_False;
+return ( !BasicIDE::ChooseMacro( uno::Reference frame::XModel 
(), sal_False, rtl::OUString() ).isEmpty() );
 }
 if ( pMethod )
 {
diff --git a/basctl/source/basicide/bastype2.cxx 
b/basctl/source/basicide/bastype2.cxx
index c3ce38a..abacd01 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -773,7 +773,7 @@ void BasicTreeListBox::GetRootEntryBitmaps( const 
ScriptDocument rDocument, Ima
 }
 }
 
-if ( sFactoryURL.getLength() )
+if ( !sFactoryURL.isEmpty() )
 {
 rImage = SvFileInformationManager::GetFileImage( INetURLObject( 
sFactoryURL ), sal_False );
 }
diff --git a/basctl/source/basicide/localizationmgr.cxx 
b/basctl/source/basicide/localizationmgr.cxx
index cf034d8..59f2316 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -185,7 +185,7 @@ void 
LocalizationMgr::implEnableDisableResourceForAllLibraryDialogs( HandleResou
 aPureIdStr += aDot;
 aPureIdStr += aDialogName;
 aPureIdStr += aDot;
-if( aCtrlName.getLength() )
+if( !aCtrlName.isEmpty() )
 {
 aPureIdStr += aCtrlName;
 aPureIdStr += aDot;
@@ -245,7 +245,7 @@ sal_Int32 
LocalizationMgr::implHandleControlResourceProperties
 // Replace string by id, add id+string to StringResource
 if( eMode == SET_IDS )
 {
-bool bEscAlreadyExisting = (aPropStr.getLength()  
aPropStr.getStr()[0] == '' );
+bool bEscAlreadyExisting = (!aPropStr.isEmpty()  
aPropStr.getStr()[0] == '' );
 if( bEscAlreadyExisting )
 continue;
 
@@ -435,7 +435,7 @@ sal_Int32 
LocalizationMgr::implHandleControlResourceProperties
 for ( i = 0; i  nPropStringCount; ++i )
 {
 ::rtl::OUString aPropStr = pPropStrings[i];
-bool bEscAlreadyExisting = (aPropStr.getLength() 
 aPropStr.getStr()[0] == '' );
+bool bEscAlreadyExisting = (!aPropStr.isEmpty()  
aPropStr.getStr()[0] == '' );
 if( bEscAlreadyExisting )
 {
 pIdStrings[i] = aPropStr;
diff --git a/basctl/source/basicide/moduldl2.cxx 
b/basctl/source/basicide/moduldl2.cxx
index ebc662c..c8960a4 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1332,7 +1332,7 @@ void

[Libreoffice-commits] .: basctl/source

2011-12-08 Thread August Sodora

 basctl/source/basicide/bastypes.cxx |   20 +---
 basctl/source/inc/bastypes.hxx  |   12 ++--
 2 files changed, 15 insertions(+), 17 deletions(-)

New commits:
commit 7ffca8ed2ed7dda9d74edb498ec74620e9489c7a
Author: August Sodora aug...@gmail.com
Date:   Fri Dec 9 00:15:26 2011 -0500

sal_Bool to bool

diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index 21dfce9..ca6b97a 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -756,7 +756,7 @@ LibInfoItem* LibInfos::GetInfo( const LibInfoKey rKey )
 return pItem;
 }
 
-sal_Bool QueryDel( const String rName, const ResId rId, Window* pParent )
+bool QueryDel( const String rName, const ResId rId, Window* pParent )
 {
 String aQuery( rId );
 String aName( rName );
@@ -764,39 +764,37 @@ sal_Bool QueryDel( const String rName, const ResId rId, 
Window* pParent )
 aName.Insert( '\'', 0 );
 aQuery.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( XX ) ), 
aName );
 QueryBox aQueryBox( pParent, WB_YES_NO | WB_DEF_YES, aQuery );
-if ( aQueryBox.Execute() == RET_YES )
-return sal_True;
-return sal_False;
+return ( aQueryBox.Execute() == RET_YES );
 }
 
-sal_Bool QueryDelMacro( const String rName, Window* pParent )
+bool QueryDelMacro( const String rName, Window* pParent )
 {
 return QueryDel( rName, IDEResId( RID_STR_QUERYDELMACRO ), pParent );
 }
 
-sal_Bool QueryReplaceMacro( const String rName, Window* pParent )
+bool QueryReplaceMacro( const String rName, Window* pParent )
 {
 return QueryDel( rName, IDEResId( RID_STR_QUERYREPLACEMACRO ), pParent );
 }
 
-sal_Bool QueryDelDialog( const String rName, Window* pParent )
+bool QueryDelDialog( const String rName, Window* pParent )
 {
 return QueryDel( rName, IDEResId( RID_STR_QUERYDELDIALOG ), pParent );
 }
 
-sal_Bool QueryDelLib( const String rName, sal_Bool bRef, Window* pParent )
+bool QueryDelLib( const String rName, bool bRef, Window* pParent )
 {
 return QueryDel( rName, IDEResId( bRef ? RID_STR_QUERYDELLIBREF : 
RID_STR_QUERYDELLIB ), pParent );
 }
 
-sal_Bool QueryDelModule( const String rName, Window* pParent )
+bool QueryDelModule( const String rName, Window* pParent )
 {
 return QueryDel( rName, IDEResId( RID_STR_QUERYDELMODULE ), pParent );
 }
 
-sal_Bool QueryPassword( const Reference script::XLibraryContainer  
xLibContainer, const String rLibName, String rPassword, sal_Bool bRepeat, 
sal_Bool bNewTitle )
+bool QueryPassword( const Reference script::XLibraryContainer  
xLibContainer, const String rLibName, String rPassword, bool bRepeat, bool 
bNewTitle )
 {
-sal_Bool bOK = sal_False;
+bool bOK = false;
 sal_uInt16 nRet = 0;
 
 do
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index fb24a2b..f65d1d6 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -274,12 +274,12 @@ voidCutLines( ::rtl::OUString rStr, 
sal_Int32 nStartLine, sal_Int32
 String  CreateMgrAndLibStr( const String rMgrName, const String 
rLibName );
 sal_uLong   CalcLineCount( SvStream rStream );
 
-sal_BoolQueryReplaceMacro( const String rName, Window* pParent = 
0 );
-sal_BoolQueryDelMacro( const String rName, Window* pParent = 0 );
-sal_BoolQueryDelDialog( const String rName, Window* pParent = 0 );
-sal_BoolQueryDelModule( const String rName, Window* pParent = 0 );
-sal_BoolQueryDelLib( const String rName, sal_Bool bRef = 
sal_False, Window* pParent = 0 );
-sal_BoolQueryPassword( const ::com::sun::star::uno::Reference 
::com::sun::star::script::XLibraryContainer  xLibContainer, const String 
rLibName, String rPassword, sal_Bool bRepeat = sal_False, sal_Bool bNewTitle = 
sal_False );
+bool QueryReplaceMacro( const String rName, Window* pParent = 0 );
+bool QueryDelMacro( const String rName, Window* pParent = 0 );
+bool QueryDelDialog( const String rName, Window* pParent = 0 );
+bool QueryDelModule( const String rName, Window* pParent = 0 );
+bool QueryDelLib( const String rName, bool bRef = sal_False, Window* pParent 
= 0 );
+bool QueryPassword( const ::com::sun::star::uno::Reference 
::com::sun::star::script::XLibraryContainer  xLibContainer, const String 
rLibName, String rPassword, bool bRepeat = false, bool bNewTitle = false );
 
 class ModuleInfoHelper
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2011-12-08 Thread August Sodora

 basctl/source/basicide/basides1.cxx |2 -
 basctl/source/basicide/bastype2.cxx |2 -
 basctl/source/basicide/bastype3.cxx |2 -
 basctl/source/basicide/bastypes.cxx |   40 ++--
 basctl/source/basicide/moduldl2.cxx |6 ++---
 basctl/source/basicide/moduldlg.cxx |2 -
 basctl/source/inc/bastypes.hxx  |   12 +-
 7 files changed, 33 insertions(+), 33 deletions(-)

New commits:
commit 9c2f9c79aca1e1dc0670d6443fd7865b8dc1ee63
Author: August Sodora aug...@gmail.com
Date:   Fri Dec 9 00:50:03 2011 -0500

String-OUString

diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index 9846e6c..b9245db 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -550,7 +550,7 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest rReq )
 Reference script::XLibraryContainerPassword  xPasswd( 
xModLibContainer, UNO_QUERY );
 if ( xPasswd.is()  xPasswd-isLibraryPasswordProtected( 
aLibName )  !xPasswd-isLibraryPasswordVerified( aLibName ) )
 {
-String aPassword;
+::rtl::OUString aPassword;
 bOK = QueryPassword( xModLibContainer, aLibName, 
aPassword );
 }
 }
diff --git a/basctl/source/basicide/bastype2.cxx 
b/basctl/source/basicide/bastype2.cxx
index 15ce341..c3ce38a 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -661,7 +661,7 @@ long BasicTreeListBox::ExpandingHdl()
 Reference script::XLibraryContainerPassword  xPasswd( 
xModLibContainer, UNO_QUERY );
 if ( xPasswd.is()  xPasswd-isLibraryPasswordProtected( 
aLibName )  !xPasswd-isLibraryPasswordVerified( aLibName ) )
 {
-String aPassword;
+::rtl::OUString aPassword;
 bOK = QueryPassword( xModLibContainer, aLibName, 
aPassword );
 }
 }
diff --git a/basctl/source/basicide/bastype3.cxx 
b/basctl/source/basicide/bastype3.cxx
index 0edbddc..9f41a7a 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -78,7 +78,7 @@ void BasicTreeListBox::RequestingChildren( SvLBoxEntry* 
pEntry )
 Reference script::XLibraryContainerPassword  xPasswd( 
xModLibContainer, UNO_QUERY );
 if ( xPasswd.is()  xPasswd-isLibraryPasswordProtected( 
aOULibName )  !xPasswd-isLibraryPasswordVerified( aOULibName ) )
 {
-String aPassword;
+::rtl::OUString aPassword;
 bOK = QueryPassword( xModLibContainer, aLibName, aPassword );
 }
 }
diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index ca6b97a..c019142 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -38,6 +38,7 @@
 #include basic/basmgr.hxx
 #include com/sun/star/script/ModuleType.hpp
 #include com/sun/star/script/XLibraryContainerPassword.hpp
+#include comphelper/string.hxx
 #include sfx2/dispatch.hxx
 #include sfx2/passwd.hxx
 #include sfx2/viewfrm.hxx
@@ -756,43 +757,43 @@ LibInfoItem* LibInfos::GetInfo( const LibInfoKey rKey )
 return pItem;
 }
 
-bool QueryDel( const String rName, const ResId rId, Window* pParent )
+bool QueryDel( const ::rtl::OUString rName, const ResId rId, Window* pParent 
)
 {
-String aQuery( rId );
-String aName( rName );
-aName += '\'';
-aName.Insert( '\'', 0 );
-aQuery.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( XX ) ), 
aName );
+::rtl::OUString aQuery( ResId::toString(rId) );
+::rtl::OUStringBuffer aNameBuf( rName );
+aNameBuf.append('\'');
+aNameBuf.insert(0, '\'');
+aQuery = ::comphelper::string::replace(aQuery, 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XX)), 
aNameBuf.makeStringAndClear());
 QueryBox aQueryBox( pParent, WB_YES_NO | WB_DEF_YES, aQuery );
 return ( aQueryBox.Execute() == RET_YES );
 }
 
-bool QueryDelMacro( const String rName, Window* pParent )
+bool QueryDelMacro( const ::rtl::OUString rName, Window* pParent )
 {
 return QueryDel( rName, IDEResId( RID_STR_QUERYDELMACRO ), pParent );
 }
 
-bool QueryReplaceMacro( const String rName, Window* pParent )
+bool QueryReplaceMacro( const ::rtl::OUString rName, Window* pParent )
 {
 return QueryDel( rName, IDEResId( RID_STR_QUERYREPLACEMACRO ), pParent );
 }
 
-bool QueryDelDialog( const String rName, Window* pParent )
+bool QueryDelDialog( const ::rtl::OUString rName, Window* pParent )
 {
 return QueryDel( rName, IDEResId( RID_STR_QUERYDELDIALOG ), pParent );
 }
 
-bool QueryDelLib( const String rName, bool bRef, Window* pParent )
+bool QueryDelLib( const ::rtl::OUString rName, bool bRef, Window* pParent )
 {
 return QueryDel( rName, IDEResId( bRef ?

[Libreoffice-commits] .: basctl/source

2011-12-04 Thread August Sodora

 basctl/source/inc/bastypes.hxx |   18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 71de946a1a2f5479667abd0e8cd0446b1db3ee96
Author: August Sodora aug...@gmail.com
Date:   Sun Dec 4 18:55:49 2011 -0500

sal_Bool to bool

diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 25b276a..8684fe5 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -53,14 +53,16 @@ sal_Int32 searchEOL( const ::rtl::OUString rStr, sal_Int32 
fromIndex );
 
 struct BasicStatus
 {
-sal_BoolbIsRunning  : 1;
-sal_BoolbError  : 1;
-sal_BoolbIsInReschedule : 1;
-sal_uInt16  nBasicFlags;
-
-BasicStatus()   {
-bIsRunning = sal_False; bError = sal_False;
-nBasicFlags = 0; bIsInReschedule = sal_False; }
+bool bIsRunning : 1;
+bool bError : 1;
+bool bIsInReschedule : 1;
+sal_uInt16 nBasicFlags;
+
+BasicStatus():
+bIsRunning(false),
+bError(false),
+bIsInReschedule(false),
+nBasicFlags(0) { }
 };
 
 struct BreakPoint
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2011-12-04 Thread Ivan Timofeev

 basctl/source/basicide/breakpoint.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit aa948e1c25dfa07f6bc47d1077a74ec61982b9c4
Author: Ivan Timofeev timofeev@gmail.com
Date:   Mon Dec 5 08:31:45 2011 +0400

add missing include for size_t

diff --git a/basctl/source/basicide/breakpoint.hxx 
b/basctl/source/basicide/breakpoint.hxx
index 16cdfa3..a989144 100644
--- a/basctl/source/basicide/breakpoint.hxx
+++ b/basctl/source/basicide/breakpoint.hxx
@@ -28,6 +28,7 @@
 #ifndef _BREAKPOINT_HXX
 #define _BREAKPOINT_HXX
 
+#include cstddef
 #include vector
 
 class SbModule;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2011-11-30 Thread Stephan Bergmann

 basctl/source/basicide/basides1.cxx |   18 +-
 basctl/source/basicide/basidesh.cxx |6 +++---
 basctl/source/basicide/basobj2.cxx  |2 +-
 basctl/source/basicide/basobj3.cxx  |2 +-
 basctl/source/basicide/bastype3.cxx |   10 +-
 basctl/source/basicide/moduldl2.cxx |2 +-
 basctl/source/basicide/moduldlg.cxx |4 ++--
 basctl/source/inc/basidesh.hxx  |2 +-
 basctl/source/inc/sbxitem.hxx   |   12 ++--
 9 files changed, 29 insertions(+), 29 deletions(-)

New commits:
commit 08b921ef07ff2f5089b1e55c9fa11325a594ab22
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Nov 30 14:51:39 2011 +0100

Enum member names live in the outer name scope.

diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index 2aff96e..62cb0c6 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -615,9 +615,9 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest rReq )
 String aName( rSbxItem.GetName() );
 if ( !m_aCurLibName.Len() || ( aDocument == m_aCurDocument  
aLibName == m_aCurLibName ) )
 {
-if ( rSbxItem.GetType() == BasicIDEType::Module )
+if ( rSbxItem.GetType() == BASICIDE_TYPE_MODULE )
 FindBasWin( aDocument, aLibName, aName, sal_True );
-else if ( rSbxItem.GetType() == BasicIDEType::Dialog )
+else if ( rSbxItem.GetType() == BASICIDE_TYPE_DIALOG )
 FindDlgWin( aDocument, aLibName, aName, sal_True );
 }
 }
@@ -641,15 +641,15 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest rReq )
 String aName( rSbxItem.GetName() );
 SetCurLib( aDocument, aLibName );
 IDEBaseWindow* pWin = 0;
-if ( rSbxItem.GetType() == BasicIDEType::Dialog )
+if ( rSbxItem.GetType() == BASICIDE_TYPE_DIALOG )
 {
 pWin = FindDlgWin( aDocument, aLibName, aName, sal_True );
 }
-else if ( rSbxItem.GetType() == BasicIDEType::Module )
+else if ( rSbxItem.GetType() == BASICIDE_TYPE_MODULE )
 {
 pWin = FindBasWin( aDocument, aLibName, aName, sal_True );
 }
-else if ( rSbxItem.GetType() == BasicIDEType::Method )
+else if ( rSbxItem.GetType() == BASICIDE_TYPE_METHOD )
 {
 pWin = FindBasWin( aDocument, aLibName, aName, sal_True );
 ((ModulWindow*)pWin)-EditMacro( rSbxItem.GetMethodName() );
@@ -1137,7 +1137,7 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, 
sal_Bool bUpdateTabBar
 BasicIDEData* pData = BasicIDEGlobals::GetExtraData();
 if ( pData )
 {
-sal_uInt16 nCurrentType = pCurWin-IsA( TYPE( ModulWindow 
) ) ? BasicIDEType::Module : BasicIDEType::Dialog;
+sal_uInt16 nCurrentType = pCurWin-IsA( TYPE( ModulWindow 
) ) ? BASICIDE_TYPE_MODULE : BASICIDE_TYPE_DIALOG;
 LibInfoItem* pLibInfoItem = new LibInfoItem( 
pCurWin-GetDocument(), pCurWin-GetLibName(), pCurWin-GetName(), nCurrentType 
);
 pData-GetLibInfos().InsertInfo( pLibInfoItem );
 }
@@ -1247,14 +1247,14 @@ IDEBaseWindow* BasicIDEShell::FindWindow( const 
ScriptDocument rDocument, const
 {
 if ( !pWin-IsSuspended() || bFindSuspended )
 {
-if ( !rLibName.Len() || !rName.Len() || nType == 
BasicIDEType::Unknown )
+if ( !rLibName.Len() || !rName.Len() || nType == 
BASICIDE_TYPE_UNKNOWN )
 {
 // return any non-suspended window
 return pWin;
 }
 else if ( pWin-IsDocument( rDocument )  pWin-GetLibName() == 
rLibName  pWin-GetName() == rName 
-  ( ( pWin-IsA( TYPE( ModulWindow ) )   nType == 
BasicIDEType::Module ) ||
-( pWin-IsA( TYPE( DialogWindow ) )  nType == 
BasicIDEType::Dialog ) ) )
+  ( ( pWin-IsA( TYPE( ModulWindow ) )   nType == 
BASICIDE_TYPE_MODULE ) ||
+( pWin-IsA( TYPE( DialogWindow ) )  nType == 
BASICIDE_TYPE_DIALOG ) ) )
 {
 return pWin;
 }
diff --git a/basctl/source/basicide/basidesh.cxx 
b/basctl/source/basicide/basidesh.cxx
index 0e77823..65c92d6 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -131,7 +131,7 @@ public:
 rtl::OUString sModuleName;
 if( mpShell   ( Event.Accessor = sModuleName ) )
 {
-IDEBaseWindow* pWin = mpShell-FindWindow( 
mpShell-m_aCurDocument, mpShell-m_aCurLibName, sModuleName, 
BasicIDEType::Module, sal_True );
+IDEBaseWindow* pWin = mpShell-FindWindow( 
mpShell-m_aCurDocument, mpShell-m_aCurLibName, sModuleName, 
BASICIDE_TYPE_MODULE, sal_True );
 if( pWin

[Libreoffice-commits] .: basctl/source

2011-11-30 Thread August Sodora

 basctl/source/basicide/bastypes.cxx |   35 +++
 1 file changed, 15 insertions(+), 20 deletions(-)

New commits:
commit 8ceae013e9664bfc86d4f95d00b2c7fb1f42be76
Author: August Sodora aug...@gmail.com
Date:   Wed Nov 30 21:48:32 2011 -0500

Remove unnecessary includes

diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index 7c79bec..f7dc4e5 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -26,29 +26,24 @@
  *
  /
 
-#include vcl/msgbox.hxx
-
-#include ide_pch.hxx
-
-#include basic/sbx.hxx
-#include helpid.hrc
-#include basidesh.hrc
-#include bastypes.hxx
-#include bastype2.hxx
-#include baside2.hxx  // unfortunately pModulWindow is needed partly...
-#include baside3.hxx
-#include baside2.hrc
-#include svtools/textview.hxx
-#include svtools/texteng.hxx
-#include basobj.hxx
-#include sbxitem.hxx
-#include iderdll.hxx
+#include baside2.hrc
+#include basidesh.hrc
+#include helpid.hrc
 
-#include sfx2/passwd.hxx
+#include baside2.hxx // unfortunately pModulWindow is needed partly...
+#include baside3.hxx
+#include basobj.hxx
+#include iderdll.hxx
 
-#include com/sun/star/script/XLibraryContainer2.hpp
-#include com/sun/star/script/XLibraryContainerPassword.hpp
+#include basic/basmgr.hxx
 #include com/sun/star/script/ModuleType.hpp
+#include com/sun/star/script/XLibraryContainerPassword.hpp
+#include sfx2/dispatch.hxx
+#include sfx2/passwd.hxx
+#include sfx2/viewfrm.hxx
+#include svl/intitem.hxx
+#include svl/stritem.hxx
+#include vcl/msgbox.hxx
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2011-11-30 Thread August Sodora

 basctl/source/basicide/basdoc.cxx |7 ++-
 basctl/source/basicide/tbxctl.cxx |   16 +++-
 2 files changed, 13 insertions(+), 10 deletions(-)

New commits:
commit 49da4d5da016f8a5cce52014b64362e8daa1bffe
Author: August Sodora aug...@gmail.com
Date:   Wed Nov 30 22:34:22 2011 -0500

Remove unnecessary includes

diff --git a/basctl/source/basicide/basdoc.cxx 
b/basctl/source/basicide/basdoc.cxx
index 4e8db31..01f8535 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -26,7 +26,12 @@
  *
  /
 
-#include ide_pch.hxx
+#include sfx2/app.hxx
+#include sfx2/docfac.hxx
+#include sfx2/printer.hxx
+#include sfx2/objface.hxx
+#include sfx2/objsh.hxx
+#include svl/itemset.hxx
 
 #include unomodel.hxx
 
diff --git a/basctl/source/basicide/tbxctl.cxx 
b/basctl/source/basicide/tbxctl.cxx
index 02f9176..985ed2d 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -26,24 +26,22 @@
  *
  /
 
+#define _BASIDE_POPUPWINDOWTBX
 
+#include tbxctl.hrc
+#include svx/svxids.hrc
 
-#include ide_pch.hxx
-
+#include idetemp.hxx
+#include tbxctl.hxx
 
-#define _BASIDE_POPUPWINDOWTBX
-#include tbxctl.hxx
-#include svx/svxids.hrc
-#include iderid.hxx
-#include tbxctl.hrc
-#include idetemp.hxx
+#include sfx2/dispatch.hxx
 #include sfx2/imagemgr.hxx
+#include sfx2/viewfrm.hxx
 #include svl/aeitem.hxx
 #include vcl/toolbox.hxx
 
 using namespace ::com::sun::star::uno;
 
-
 static ::rtl::OUString aSubToolBarResName( RTL_CONSTASCII_USTRINGPARAM( 
private:resource/toolbar/insertcontrolsbar ) );
 
 SFX_IMPL_TOOLBOX_CONTROL( TbxControls, SfxAllEnumItem )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2011-11-29 Thread August Sodora

 basctl/source/basicide/bastypes.cxx |4 ++--
 basctl/source/inc/sbxitem.hxx   |   24 +++-
 2 files changed, 13 insertions(+), 15 deletions(-)

New commits:
commit e007d3f3b93235be8dfd328db6cf38475acb49a7
Author: August Sodora aug...@gmail.com
Date:   Wed Nov 30 01:41:45 2011 -0500

String-OUString

diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index 91d2576..4dcc710 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -886,7 +886,7 @@ LibInfoItem* LibInfos::GetInfo( const LibInfoKey rKey )
 return pItem;
 }
 
-SbxItem::SbxItem(sal_uInt16 nWhich_, const ScriptDocument rDocument, const 
String aLibName, const String aName, sal_uInt16 nType )
+SbxItem::SbxItem(sal_uInt16 nWhich_, const ScriptDocument rDocument, const 
::rtl::OUString aLibName, const ::rtl::OUString aName, sal_uInt16 nType )
 :SfxPoolItem( nWhich_ )
 ,m_aDocument(rDocument)
 ,m_aLibName(aLibName)
@@ -895,7 +895,7 @@ SbxItem::SbxItem(sal_uInt16 nWhich_, const ScriptDocument 
rDocument, const Stri
 {
 }
 
-SbxItem::SbxItem(sal_uInt16 nWhich_, const ScriptDocument rDocument, const 
String aLibName, const String aName, const String aMethodName, sal_uInt16 
nType )
+SbxItem::SbxItem(sal_uInt16 nWhich_, const ScriptDocument rDocument, const 
::rtl::OUString aLibName, const ::rtl::OUString aName, const ::rtl::OUString 
aMethodName, sal_uInt16 nType )
 :SfxPoolItem( nWhich_ )
 ,m_aDocument(rDocument)
 ,m_aLibName(aLibName)
diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx
index d1efe51..94a8b51 100644
--- a/basctl/source/inc/sbxitem.hxx
+++ b/basctl/source/inc/sbxitem.hxx
@@ -38,19 +38,18 @@ const sal_uInt16 BASICIDE_TYPE_MODULE   =   3;
 const sal_uInt16 BASICIDE_TYPE_DIALOG   =   4;
 const sal_uInt16 BASICIDE_TYPE_METHOD   =   5;
 
-
 class SbxItem : public SfxPoolItem
 {
 ScriptDocument  m_aDocument;
-String  m_aLibName;
-String  m_aName;
-String  m_aMethodName;
+::rtl::OUString m_aLibName;
+::rtl::OUString m_aName;
+::rtl::OUString m_aMethodName;
 sal_uInt16  m_nType;
 
 public:
 TYPEINFO();
-SbxItem( sal_uInt16 nWhich, const ScriptDocument rDocument, const String 
aLibName, const String aName, sal_uInt16 nType );
-SbxItem( sal_uInt16 nWhich, const ScriptDocument rDocument, const String 
aLibName, const String aName, const String aMethodName, sal_uInt16 nType );
+SbxItem( sal_uInt16 nWhich, const ScriptDocument rDocument, const 
::rtl::OUString aLibName, const ::rtl::OUString aName, sal_uInt16 nType );
+SbxItem( sal_uInt16 nWhich, const ScriptDocument rDocument, const 
::rtl::OUString aLibName, const ::rtl::OUString aName, const ::rtl::OUString 
aMethodName, sal_uInt16 nType );
 SbxItem( const SbxItem );
 
 virtual SfxPoolItem*Clone( SfxItemPool *pPool = 0 ) const;
@@ -60,20 +59,19 @@ public:
 GetDocument() const { return m_aDocument; }
 voidSetDocument( const ScriptDocument rDocument ) { 
m_aDocument = rDocument; }
 
-const String   GetLibName() const { return m_aLibName; }
-voidSetLibName( const String aLibName ) { m_aLibName 
= aLibName; }
+const ::rtl::OUString  GetLibName() const { return m_aLibName; }
+voidSetLibName( const ::rtl::OUString aLibName ) { 
m_aLibName = aLibName; }
 
-const String   GetName() const { return m_aName; }
-voidSetName( const String aName ) { m_aName = aName; }
+const ::rtl::OUString  GetName() const { return m_aName; }
+voidSetName( const ::rtl::OUString aName ) { m_aName 
= aName; }
 
-const String   GetMethodName() const { return m_aMethodName; }
-voidSetMethodName( const String aMethodName ) { 
m_aMethodName = aMethodName; }
+const ::rtl::OUString  GetMethodName() const { return m_aMethodName; }
+voidSetMethodName( const ::rtl::OUString aMethodName 
) { m_aMethodName = aMethodName; }
 
 sal_uInt16  GetType() const { return m_nType; }
 voidSetType( sal_uInt16 nType ) { m_nType = nType; }
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2011-11-29 Thread August Sodora

 basctl/source/basicide/basides1.cxx |   20 ++--
 basctl/source/basicide/basidesh.cxx |6 +++---
 basctl/source/basicide/basobj2.cxx  |2 +-
 basctl/source/basicide/basobj3.cxx  |2 +-
 basctl/source/basicide/bastype2.hxx |2 +-
 basctl/source/basicide/bastype3.cxx |   14 +++---
 basctl/source/basicide/bastypes.cxx |4 ++--
 basctl/source/basicide/moduldl2.cxx |2 +-
 basctl/source/basicide/moduldlg.cxx |4 ++--
 basctl/source/inc/basidesh.hxx  |2 +-
 basctl/source/inc/sbxitem.hxx   |   25 ++---
 11 files changed, 43 insertions(+), 40 deletions(-)

New commits:
commit 1eb974c1429967ce76db4b16192a9a95b3e8cc6f
Author: August Sodora aug...@gmail.com
Date:   Wed Nov 30 02:11:15 2011 -0500

Convert group of consts to enum

diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index 8d184e2..2aff96e 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -615,9 +615,9 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest rReq )
 String aName( rSbxItem.GetName() );
 if ( !m_aCurLibName.Len() || ( aDocument == m_aCurDocument  
aLibName == m_aCurLibName ) )
 {
-if ( rSbxItem.GetType() == BASICIDE_TYPE_MODULE )
+if ( rSbxItem.GetType() == BasicIDEType::Module )
 FindBasWin( aDocument, aLibName, aName, sal_True );
-else if ( rSbxItem.GetType() == BASICIDE_TYPE_DIALOG )
+else if ( rSbxItem.GetType() == BasicIDEType::Dialog )
 FindDlgWin( aDocument, aLibName, aName, sal_True );
 }
 }
@@ -641,15 +641,15 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest rReq )
 String aName( rSbxItem.GetName() );
 SetCurLib( aDocument, aLibName );
 IDEBaseWindow* pWin = 0;
-if ( rSbxItem.GetType() == BASICIDE_TYPE_DIALOG )
+if ( rSbxItem.GetType() == BasicIDEType::Dialog )
 {
 pWin = FindDlgWin( aDocument, aLibName, aName, sal_True );
 }
-else if ( rSbxItem.GetType() == BASICIDE_TYPE_MODULE )
+else if ( rSbxItem.GetType() == BasicIDEType::Module )
 {
 pWin = FindBasWin( aDocument, aLibName, aName, sal_True );
 }
-else if ( rSbxItem.GetType() == BASICIDE_TYPE_METHOD )
+else if ( rSbxItem.GetType() == BasicIDEType::Method )
 {
 pWin = FindBasWin( aDocument, aLibName, aName, sal_True );
 ((ModulWindow*)pWin)-EditMacro( rSbxItem.GetMethodName() );
@@ -1137,7 +1137,7 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, 
sal_Bool bUpdateTabBar
 BasicIDEData* pData = BasicIDEGlobals::GetExtraData();
 if ( pData )
 {
-sal_uInt16 nCurrentType = pCurWin-IsA( TYPE( ModulWindow 
) ) ? BASICIDE_TYPE_MODULE : BASICIDE_TYPE_DIALOG;
+sal_uInt16 nCurrentType = pCurWin-IsA( TYPE( ModulWindow 
) ) ? BasicIDEType::Module : BasicIDEType::Dialog;
 LibInfoItem* pLibInfoItem = new LibInfoItem( 
pCurWin-GetDocument(), pCurWin-GetLibName(), pCurWin-GetName(), nCurrentType 
);
 pData-GetLibInfos().InsertInfo( pLibInfoItem );
 }
@@ -1240,21 +1240,21 @@ IDEBaseWindow* BasicIDEShell::FindApplicationWindow()
 return FindWindow( ScriptDocument::getApplicationScriptDocument() );
 }
 
-IDEBaseWindow* BasicIDEShell::FindWindow( const ScriptDocument rDocument, 
const String rLibName, const String rName, sal_uInt16 nType, sal_Bool 
bFindSuspended )
+IDEBaseWindow* BasicIDEShell::FindWindow( const ScriptDocument rDocument, 
const String rLibName, const String rName, BasicIDEType nType, sal_Bool 
bFindSuspended )
 {
 IDEBaseWindow* pWin = aIDEWindowTable.First();
 while ( pWin )
 {
 if ( !pWin-IsSuspended() || bFindSuspended )
 {
-if ( !rLibName.Len() || !rName.Len() || nType == 
BASICIDE_TYPE_UNKNOWN )
+if ( !rLibName.Len() || !rName.Len() || nType == 
BasicIDEType::Unknown )
 {
 // return any non-suspended window
 return pWin;
 }
 else if ( pWin-IsDocument( rDocument )  pWin-GetLibName() == 
rLibName  pWin-GetName() == rName 
-  ( ( pWin-IsA( TYPE( ModulWindow ) )   nType == 
BASICIDE_TYPE_MODULE ) ||
-( pWin-IsA( TYPE( DialogWindow ) )  nType == 
BASICIDE_TYPE_DIALOG ) ) )
+  ( ( pWin-IsA( TYPE( ModulWindow ) )   nType == 
BasicIDEType::Module ) ||
+( pWin-IsA( TYPE( DialogWindow ) )  nType == 
BasicIDEType::Dialog ) ) )
 {
 return pWin;
 }
diff --git a/basctl/source/basicide/basidesh.cxx 
b/basctl/source/basicide/basidesh.cxx
index

[Libreoffice-commits] .: basctl/source

2011-11-28 Thread August Sodora

 basctl/source/basicide/localizationmgr.cxx |   14 +++---
 basctl/source/inc/localizationmgr.hxx  |8 
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit a82a87315033e416d267242002b6722051deb8a4
Author: August Sodora aug...@gmail.com
Date:   Mon Nov 28 22:16:47 2011 -0500

String-OUString

diff --git a/basctl/source/basicide/localizationmgr.cxx 
b/basctl/source/basicide/localizationmgr.cxx
index d6cd053..cf034d8 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -50,7 +50,7 @@ static ::rtl::OUString aSemi( RTL_CONSTASCII_USTRINGPARAM( 
; ));
 
 
 LocalizationMgr::LocalizationMgr( BasicIDEShell* pIDEShell,
-const ScriptDocument rDocument, String aLibName,
+const ScriptDocument rDocument, ::rtl::OUString aLibName,
 const Reference XStringResourceManager  xStringResourceManager )
 : m_xStringResourceManager( xStringResourceManager )
 , m_pIDEShell( pIDEShell )
@@ -927,8 +927,8 @@ void 
LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject( DlgEditor*
 BasicIDE::MarkDocumentModified( aDocument );
 }
 
-void LocalizationMgr::setStringResourceAtDialog( const ScriptDocument 
rDocument, const String aLibName,
-const String aDlgName, Reference container::XNameContainer  
xDialogModel )
+void LocalizationMgr::setStringResourceAtDialog( const ScriptDocument 
rDocument, const ::rtl::OUString aLibName,
+const ::rtl::OUString aDlgName, Reference container::XNameContainer  
xDialogModel )
 {
 static ::rtl::OUString aResourceResolverPropName( 
RTL_CONSTASCII_USTRINGPARAM( ResourceResolver ));
 
@@ -959,8 +959,8 @@ void LocalizationMgr::setStringResourceAtDialog( const 
ScriptDocument rDocument
 }
 }
 
-void LocalizationMgr::renameStringResourceIDs( const ScriptDocument 
rDocument, const String aLibName,
-const String aDlgName, Reference container::XNameContainer  
xDialogModel )
+void LocalizationMgr::renameStringResourceIDs( const ScriptDocument 
rDocument, const ::rtl::OUString aLibName,
+const ::rtl::OUString aDlgName, Reference container::XNameContainer  
xDialogModel )
 {
 // Get library
 Reference container::XNameContainer  xDialogLib( rDocument.getLibrary( 
E_DIALOGS, aLibName, sal_True ) );
@@ -990,8 +990,8 @@ void LocalizationMgr::renameStringResourceIDs( const 
ScriptDocument rDocument,
 }
 }
 
-void LocalizationMgr::removeResourceForDialog( const ScriptDocument 
rDocument, const String aLibName,
-const String aDlgName, Reference container::XNameContainer  
xDialogModel )
+void LocalizationMgr::removeResourceForDialog( const ScriptDocument 
rDocument, const ::rtl::OUString aLibName,
+const ::rtl::OUString aDlgName, Reference container::XNameContainer  
xDialogModel )
 {
 // Get library
 Reference container::XNameContainer  xDialogLib( rDocument.getLibrary( 
E_DIALOGS, aLibName, sal_True ) );
diff --git a/basctl/source/inc/localizationmgr.hxx 
b/basctl/source/inc/localizationmgr.hxx
index 6942b8e..67a0131 100644
--- a/basctl/source/inc/localizationmgr.hxx
+++ b/basctl/source/inc/localizationmgr.hxx
@@ -75,7 +75,7 @@ class LocalizationMgr
 void implEnableDisableResourceForAllLibraryDialogs( HandleResourceMode 
eMode );
 
 public:
-LocalizationMgr( BasicIDEShell* pIDEShell, const ScriptDocument 
rDocument, String aLibName,
+LocalizationMgr( BasicIDEShell* pIDEShell, const ScriptDocument 
rDocument, ::rtl::OUString aLibName,
 const ::com::sun::star::uno::Reference
  ::com::sun::star::resource::XStringResourceManager  
xStringResourceManager );
 ::com::sun::star::uno::Reference
@@ -111,13 +111,13 @@ public:
 static void deleteControlResourceIDsForDeletedEditorObject( DlgEditor* 
pEditor,
 ::com::sun::star::uno::Any aControlAny, const ::rtl::OUString 
aCtrlName );
 
-static void setStringResourceAtDialog( const ScriptDocument rDocument, 
const String aLibName, const String aDlgName,
+static void setStringResourceAtDialog( const ScriptDocument rDocument, 
const ::rtl::OUString aLibName, const ::rtl::OUString aDlgName,
 ::com::sun::star::uno::Reference 
::com::sun::star::container::XNameContainer  xDialogModel );
 
-static void renameStringResourceIDs( const ScriptDocument rDocument, 
const String aLibName, const String aDlgName,
+static void renameStringResourceIDs( const ScriptDocument rDocument, 
const ::rtl::OUString aLibName, const ::rtl::OUString aDlgName,
 ::com::sun::star::uno::Reference 
::com::sun::star::container::XNameContainer  xDialogModel );
 
-static void removeResourceForDialog( const ScriptDocument rDocument, 
const String aLibName, const String aDlgName,
+static void removeResourceForDialog( const ScriptDocument rDocument, 
const ::rtl::OUString aLibName, const ::rtl::OUString aDlgName,
 ::com::sun::star::uno::Reference 
::com::sun::star::container::XNameContainer  xDialogModel );
 
 static

[Libreoffice-commits] .: basctl/source

2011-11-21 Thread August Sodora

 basctl/source/basicide/basicbox.cxx |4 ++--
 basctl/source/basicide/baside2.hxx  |2 +-
 basctl/source/basicide/baside2b.cxx |   15 +++
 basctl/source/basicide/basobj2.cxx  |4 ++--
 basctl/source/basicide/moduldl2.cxx |2 +-
 5 files changed, 13 insertions(+), 14 deletions(-)

New commits:
commit ea1c1ad843d219bc2e6d99d72998eb8a00805493
Author: August Sodora aug...@gmail.com
Date:   Mon Nov 21 20:13:24 2011 -0500

cppcheck: C-style pointer casting

diff --git a/basctl/source/basicide/basicbox.cxx 
b/basctl/source/basicide/basicbox.cxx
index 2a5a7ca..7e20bca 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -328,7 +328,7 @@ void BasicLibBox::Select()
 void BasicLibBox::NotifyIDE()
 {
 sal_uInt16 nSelPos = GetSelectEntryPos();
-BasicLibEntry* pEntry = (BasicLibEntry*)GetEntryData( nSelPos );
+BasicLibEntry* pEntry = static_castBasicLibEntry*(GetEntryData( nSelPos 
));
 if ( pEntry )
 {
 ScriptDocument aDocument( pEntry-GetDocument() );
@@ -352,7 +352,7 @@ void BasicLibBox::ClearBox()
 sal_uInt16 nCount = GetEntryCount();
 for ( sal_uInt16 i = 0; i  nCount; ++i )
 {
-BasicLibEntry* pEntry = (BasicLibEntry*)GetEntryData( i );
+BasicLibEntry* pEntry = static_castBasicLibEntry*(GetEntryData( i ));
 delete pEntry;
 }
 ListBox::Clear();
diff --git a/basctl/source/basicide/baside2.hxx 
b/basctl/source/basicide/baside2.hxx
index 48a65c9..ebf501e 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -148,7 +148,7 @@ public:
 EditorWindow( Window* pParent );
 ~EditorWindow();
 
-ExtTextEngine*  GetEditEngine() const   { return 
(ExtTextEngine*)pEditEngine; }
+ExtTextEngine*  GetEditEngine() const   { return pEditEngine; }
 ExtTextView*GetEditView() const { return pEditView; }
 ProgressInfo*   GetProgress() const { return pProgress; }
 
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 1fb174a..ac42db8 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -769,7 +769,7 @@ void EditorWindow::ImpDoHighlight( sal_uLong nLine )
 for ( size_t i = 0; i  aPortions.size(); i++ )
 {
 HighlightPortion r = aPortions[i];
-const Color rColor = 
((ModulWindowLayout*)pModulWindow-GetLayoutWindow())-getSyntaxColor(r.tokenType);
+const Color rColor = 
dynamic_castModulWindowLayout*(pModulWindow-GetLayoutWindow())-getSyntaxColor(r.tokenType);
 pEditEngine-SetAttrib( TextAttribFontColor( rColor ), nLine, 
r.nBegin, r.nEnd, sal_True );
 }
 
@@ -960,10 +960,10 @@ void BreakPointWindow::Paint( const Rectangle )
 Size aOutSz( GetOutputSize() );
 long nLineHeight = GetTextHeight();
 
-Image aBrk1(((ModulWindowLayout *) pModulWindow-GetLayoutWindow())-
-getImage(IMGID_BRKENABLED));
-Image aBrk0(((ModulWindowLayout *) pModulWindow-GetLayoutWindow())-
-getImage(IMGID_BRKDISABLED));
+ModulWindowLayout* pModulWindowLayout = 
dynamic_castModulWindowLayout*(pModulWindow-GetLayoutWindow());
+
+Image aBrk1(pModulWindowLayout-getImage(IMGID_BRKENABLED));
+Image aBrk0(pModulWindowLayout-getImage(IMGID_BRKDISABLED));
 Size aBmpSz( aBrk1.GetSizePixel() );
 aBmpSz = PixelToLogic( aBmpSz );
 Point aBmpOff( 0, 0 );
@@ -1009,9 +1009,8 @@ void BreakPointWindow::ShowMarker( sal_Bool bShow )
 Size aOutSz( GetOutputSize() );
 long nLineHeight = GetTextHeight();
 
-Image aMarker(((ModulWindowLayout*)pModulWindow-GetLayoutWindow())-
-  getImage(bErrorMarker
-   ? IMGID_ERRORMARKER : IMGID_STEPMARKER));
+ModulWindowLayout* pModulWindowLayout = 
dynamic_castModulWindowLayout*(pModulWindow-GetLayoutWindow());
+Image aMarker(pModulWindowLayout-getImage(bErrorMarker ? 
IMGID_ERRORMARKER : IMGID_STEPMARKER));
 
 Size aMarkerSz( aMarker.GetSizePixel() );
 aMarkerSz = PixelToLogic( aMarkerSz );
diff --git a/basctl/source/basicide/basobj2.cxx 
b/basctl/source/basicide/basobj2.cxx
index 7954b09..68a40f6 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -205,7 +205,7 @@ bool RenameModule( Window* pErrorParent, const 
ScriptDocument rDocument, const
 pWin-SetName( rNewName );
 
 // set new module in module window
-ModulWindow* pModWin = (ModulWindow*)pWin;
+ModulWindow* pModWin = dynamic_castModulWindow*(pWin);
 pModWin-SetSbModule( (SbModule*)pModWin-GetBasic()-FindModule( 
rNewName ) );
 
 // update tabwriter
@@ -308,7 +308,7 @@ namespace
 SbModule* pModule = pMethod-GetModule();
 ENSURE_OR_BREAK( pModule, BasicIDE::ChooseMacro: No Module 
found! );
 
-StarBASIC* pBasic =

[Libreoffice-commits] .: basctl/source

2011-11-21 Thread August Sodora

 basctl/source/basicide/linenumberwindow.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit a7c455d10148f6562583f034147b600d61500af1
Author: August Sodora aug...@gmail.com
Date:   Mon Nov 21 20:15:25 2011 -0500

unused local variable

diff --git a/basctl/source/basicide/linenumberwindow.hxx 
b/basctl/source/basicide/linenumberwindow.hxx
index 39041b9..48c2414 100644
--- a/basctl/source/basicide/linenumberwindow.hxx
+++ b/basctl/source/basicide/linenumberwindow.hxx
@@ -38,7 +38,6 @@ private:
 ModulWindow* m_pModulWindow;
 int m_nWidth;
 long m_nCurYOffset;
-int m_nCharWidth;
 int m_nBaseWidth;
 virtual void DataChanged(DataChangedEvent const  rDCEvt);
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2011-11-21 Thread August Sodora

 basctl/source/dlged/dlgedobj.cxx |   33 ++---
 1 file changed, 10 insertions(+), 23 deletions(-)

New commits:
commit 59e4b21c6723066f30a1a34a8fd25eb01fb66fc4
Author: August Sodora aug...@gmail.com
Date:   Mon Nov 21 20:28:01 2011 -0500

Removed unnecessary includes

diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 11a892c..7b8bdc9 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -29,37 +29,25 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include precompiled_basctl.hxx
 
-#include vector
-#include dlgeddef.hxx
-#include dlgedobj.hxx
 #include dlged.hxx
-#include dlgedmod.hxx
+#include dlgeddef.hxx
+#include dlgedlist.hxx
+#include dlgedobj.hxx
 #include dlgedpage.hxx
 #include dlgedview.hxx
-#include dlgedlist.hxx
-#include iderid.hxx
-#include localizationmgr.hxx
+#include iderid.hxx
+#include localizationmgr.hxx
+
+#include dlgresid.hrc
 
-#include dlgresid.hrc
-#include tools/resmgr.hxx
-#include tools/shl.hxx
-#include unotools/sharedunocomponent.hxx
-#include com/sun/star/awt/XTabControllerModel.hpp
 #include com/sun/star/awt/XUnoControlContainer.hpp
 #include com/sun/star/awt/XVclContainerPeer.hpp
-#include com/sun/star/awt/XWindow.hpp
-#include com/sun/star/beans/XPropertySet.hpp
-#include com/sun/star/beans/PropertyAttribute.hpp
-#include com/sun/star/script/XScriptEventsSupplier.hpp
 #include com/sun/star/container/XContainer.hpp
 #include com/sun/star/lang/XServiceInfo.hpp
-#include comphelper/processfactory.hxx
-#include comphelper/types.hxx
-#include vcl/svapp.hxx
-
-#include algorithm
-#include functional
+#include com/sun/star/script/XScriptEventsSupplier.hpp
 #include o3tl/compat_functional.hxx
+#include unotools/sharedunocomponent.hxx
+#include vcl/svapp.hxx
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -68,7 +56,6 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::script;
 using ::rtl::OUString;
 
-
 TYPEINIT1(DlgEdObj, SdrUnoObj);
 DBG_NAME(DlgEdObj);
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2011-11-21 Thread August Sodora

 basctl/source/dlged/propbrw.cxx |   42 ++--
 1 file changed, 11 insertions(+), 31 deletions(-)

New commits:
commit 48ea07772907b7a6112b614b4f7216b357d6c43a
Author: August Sodora aug...@gmail.com
Date:   Mon Nov 21 20:36:23 2011 -0500

Removed unnecessary includes

diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index d192aba..50d5b03 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -29,42 +29,24 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include precompiled_basctl.hxx
 
-#include sal/macros.h
-#include propbrw.hxx
-#include dlgedobj.hxx
-
 #include basidesh.hxx
-#include iderid.hxx
-
-#include dlgresid.hrc
-#include tools/debug.hxx
-#include tools/diagnose_ex.h
-#include sfx2/bindings.hxx
-#include sfx2/childwin.hxx
-#include sfx2/objitem.hxx
+#include dlgedobj.hxx
+#include iderid.hxx
+#include propbrw.hxx
 
+#include dlgresid.hrc
 #include svx/svxids.hrc
-#include tools/shl.hxx
-#include vcl/stdtext.hxx
-#include svx/svdview.hxx
-#include svx/svdogrp.hxx
-#include svx/svdpage.hxx
-#include svx/svditer.hxx
-#include sfx2/viewsh.hxx
 
-#include toolkit/unohlp.hxx
-#include comphelper/property.hxx
-#include comphelper/stl_types.hxx
-#include comphelper/types.hxx
-#include com/sun/star/beans/PropertyValue.hpp
 #include com/sun/star/awt/PosSize.hpp
-#include com/sun/star/lang/XServiceInfo.hpp
 #include com/sun/star/inspection/XObjectInspector.hpp
-#include comphelper/processfactory.hxx
+#include com/sun/star/lang/XServiceInfo.hpp
+#include comphelper/types.hxx
 #include cppuhelper/component_context.hxx
-
-#include sfx2/dispatch.hxx
-#include sfx2/viewfrm.hxx
+#include svx/svditer.hxx
+#include svx/svdview.hxx
+#include toolkit/unohlp.hxx
+#include tools/diagnose_ex.h
+#include vcl/stdtext.hxx
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -74,10 +56,8 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::comphelper;
 
-
 SFX_IMPL_FLOATINGWINDOW(PropBrwMgr, SID_SHOW_PROPERTYBROWSER)
 
-
 PropBrwMgr::PropBrwMgr( Window* _pParent, sal_uInt16 nId,
 SfxBindings *pBindings, SfxChildWinInfo* pInfo)
   :SfxChildWindow( _pParent, nId )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2011-11-18 Thread Stephan Bergmann

 basctl/source/basicide/linenumberwindow.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 28590197df79b89ff15c43636b26dc1dde7a66c8
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Nov 18 11:39:03 2011 +0100

-Werror=shadow fix

diff --git a/basctl/source/basicide/linenumberwindow.cxx 
b/basctl/source/basicide/linenumberwindow.cxx
index d4f606b..2f593e9 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -57,8 +57,8 @@ void LineNumberWindow::Paint( const Rectangle )
 }
 
 sal_Int64 y = (nStartLine - 1) * nLineHeight;
-for(int i = nStartLine; i = nEndLine; ++i, y += nLineHeight)
-DrawText(Point(0, y - m_nCurYOffset), String::CreateFromInt32(i));
+for(int n = nStartLine; n = nEndLine; ++n, y += nLineHeight)
+DrawText(Point(0, y - m_nCurYOffset), String::CreateFromInt32(n));
 }
 
 void LineNumberWindow::DataChanged(DataChangedEvent const  rDCEvt)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source officecfg/registry

2011-11-18 Thread Noel Power

 basctl/source/basicide/linenumberwindow.cxx   |   29 
+
 basctl/source/basicide/linenumberwindow.hxx   |   30 
+-
 officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu |2 
 3 files changed, 57 insertions(+), 4 deletions(-)

New commits:
commit fd48c0eead825326ce1ee31d043185a79e7fa87f
Author: Noel Power noel.po...@novell.com
Date:   Fri Nov 18 16:41:11 2011 +

add license info to linenumberwindow.[ch]xx, fix menu label

diff --git a/basctl/source/basicide/linenumberwindow.cxx 
b/basctl/source/basicide/linenumberwindow.cxx
index 2f593e9..837e477 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -1,4 +1,30 @@
-/* -*- Mode: C++; eval:(c-set-style bsd); tab-width: 4; indent-tabs-mode: 
nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the License); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an AS IS basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * [ Copyright (C) 2011 August Sodora aug...@gmail.com (initial developer) ]
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the GPLv3+), or
+ * the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
 
 #include baside2.hxx
 #include linenumberwindow.hxx
@@ -106,3 +132,4 @@ int LineNumberWindow::GetWidth()
 {
 return m_nWidth;
 }
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/linenumberwindow.hxx 
b/basctl/source/basicide/linenumberwindow.hxx
index 74b44be..39041b9 100644
--- a/basctl/source/basicide/linenumberwindow.hxx
+++ b/basctl/source/basicide/linenumberwindow.hxx
@@ -1,5 +1,30 @@
-/* -*- Mode: C++; eval:(c-set-style bsd); tab-width: 4; indent-tabs-mode: 
nil; c-basic-offset: 4 -*- */
-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the License); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an AS IS basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * [ Copyright (C) 2011 August Sodora aug...@gmail.com (initial developer) ]
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the GPLv3+), or
+ * the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
 #ifndef BASICIDE_LINENUMBERWINDOW_HXX
 #define BASICIDE_LINENUMBERWINDOW_HXX
 
@@ -33,3 +58,4 @@ public:
 };
 
 #endif // BASICIDE_LINENUMBERWINDOW_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
index c711808..84e5c41 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
@@ -10,7 +10,7 @@
 /node
 node oor:name=.uno:ShowLines oor:op=replace
  prop oor:name=Label oor:type=xs:string
- value xml:lang=en-USDisplay Source Line 
Number.../value
+ value xml:lang=en-USDisplay Source Line Number/value
  /prop
 /node
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2011-11-07 Thread Caolán McNamara

 basctl/source/basicide/basidesh.cxx|1 
 basctl/source/inc/accessibledialogcontrolshape.hxx |7 -
 basctl/source/inc/accessibledialogwindow.hxx   |5 
 basctl/source/inc/basidectrlr.hxx  |2 -
 basctl/source/inc/basidesh.hxx |   14 ---
 basctl/source/inc/basobj.hxx   |9 ---
 basctl/source/inc/bastypes.hxx |   26 -
 basctl/source/inc/dlged.hxx|   10 +++-
 basctl/source/inc/dlgedclip.hxx|5 
 basctl/source/inc/dlgeddef.hxx |3 --
 basctl/source/inc/dlgedfac.hxx |1 
 basctl/source/inc/dlgedfunc.hxx|5 
 basctl/source/inc/dlgedmod.hxx |5 
 basctl/source/inc/dlgedobj.hxx |7 +
 basctl/source/inc/localizationmgr.hxx  |6 ++--
 basctl/source/inc/managelang.hxx   |7 ++---
 basctl/source/inc/propbrw.hxx  |6 
 17 files changed, 29 insertions(+), 90 deletions(-)

New commits:
commit e505b16440d7d9db2ed375c023d78b388ac61469
Author: August Sodora aug...@gmail.com
Date:   Sun Nov 6 21:21:30 2011 -0500

Remove superfluous includes and forward decls

diff --git a/basctl/source/basicide/basidesh.cxx 
b/basctl/source/basicide/basidesh.cxx
index 0b969de..9e7379f 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -82,6 +82,7 @@
 #include com/sun/star/script/XLibraryContainer.hpp
 
 #include svx/xmlsecctrl.hxx
+#include sfx2/viewfac.hxx
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx 
b/basctl/source/inc/accessibledialogcontrolshape.hxx
index f45e4eb..efa5321 100644
--- a/basctl/source/inc/accessibledialogcontrolshape.hxx
+++ b/basctl/source/inc/accessibledialogcontrolshape.hxx
@@ -29,14 +29,10 @@
 #ifndef _BASCTL_ACCESSIBLEDIALOGCONTROLSHAPE_HXX_
 #define _BASCTL_ACCESSIBLEDIALOGCONTROLSHAPE_HXX_
 
-#include com/sun/star/accessibility/XAccessible.hpp
+#include com/sun/star/beans/XPropertySet.hpp
 #include com/sun/star/lang/XServiceInfo.hpp
-#include com/sun/star/beans/XPropertyChangeListener.hpp
 #include comphelper/accessiblecomponenthelper.hxx
 #include cppuhelper/implbase3.hxx
-#include com/sun/star/beans/XPropertySet.hpp
-
-#include vector
 
 class Window;
 class DialogWindow;
@@ -47,7 +43,6 @@ namespace utl {
 class AccessibleStateSetHelper;
 }
 
-
 //  
 //  class AccessibleDialogControlShape
 //  
diff --git a/basctl/source/inc/accessibledialogwindow.hxx 
b/basctl/source/inc/accessibledialogwindow.hxx
index ed8594a..c2376a9 100644
--- a/basctl/source/inc/accessibledialogwindow.hxx
+++ b/basctl/source/inc/accessibledialogwindow.hxx
@@ -29,15 +29,12 @@
 #ifndef _BASCTL_ACCESSIBLEDIALOGWINDOW_HXX_
 #define _BASCTL_ACCESSIBLEDIALOGWINDOW_HXX_
 
-#include com/sun/star/accessibility/XAccessible.hpp
 #include com/sun/star/accessibility/XAccessibleSelection.hpp
 #include com/sun/star/lang/XServiceInfo.hpp
 #include comphelper/accessiblecomponenthelper.hxx
 #include cppuhelper/implbase3.hxx
-#include tools/link.hxx
 #include svl/lstner.hxx
-
-#include vector
+#include tools/link.hxx
 
 class DialogWindow;
 class DlgEditor;
diff --git a/basctl/source/inc/basidectrlr.hxx 
b/basctl/source/inc/basidectrlr.hxx
index 8532b76..22cc033 100644
--- a/basctl/source/inc/basidectrlr.hxx
+++ b/basctl/source/inc/basidectrlr.hxx
@@ -34,10 +34,8 @@
 #include comphelper/proparrhlp.hxx
 #include sfx2/sfxbasecontroller.hxx
 
-
 class BasicIDEShell;
 
-
 class BasicIDEController:public comphelper::OMutexAndBroadcastHelper
 ,public ::comphelper::OPropertyContainer
 ,public ::comphelper::OPropertyArrayUsageHelper 
BasicIDEController 
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index b7b7c11..15fd8f2 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -28,20 +28,16 @@
 #ifndef _BASIDESH_HXX
 #define _BASIDESH_HXX
 
+#include doceventnotifier.hxx
 #include sbxitem.hxx
 
-#include scriptdocument.hxx
-#include doceventnotifier.hxx
-#include sfx2/viewfac.hxx
-#include sfx2/shell.hxx
-#include vcl/scrbar.hxx
-#include tools/table.hxx
+#include com/sun/star/container/XContainerListener.hpp
 #include sfx2/viewsh.hxx
 #include svx/ifaceids.hxx
+#include tools/table.hxx
+#include vcl/scrbar.hxx
 
-#include com/sun/star/io/XInputStreamProvider.hpp
-
-#include com/sun/star/container/XContainerListener.hpp
+class SfxViewFactory;
 
 //
 
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index e168542..8f72305

[Libreoffice-commits] .: basctl/source

2011-11-02 Thread Joseph Powers

 basctl/source/basicide/bastype4.hxx |   69 
 1 file changed, 69 deletions(-)

New commits:
commit f65946944eca8da10d1e54a78eb2537e205e855c
Author: Joseph Powers jpower...@cox.net
Date:   Wed Nov 2 05:56:25 2011 -0700

Remove an unused header from basctl

diff --git a/basctl/source/basicide/bastype4.hxx 
b/basctl/source/basicide/bastype4.hxx
deleted file mode 100644
index 000eec7..000
--- a/basctl/source/basicide/bastype4.hxx
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-#ifndef _BASTYPE4_HXX
-#define _BASTYPE4_HXX
-
-
-#include svtools/tabbar.hxx
-
-class EditEngine;
-class EditView;
-
-class ExtendedTabBar : public TabBar
-{
-EditEngine* pEditEngine;
-EditView*   pEditView;
-sal_BoolbIsInKeyInput;
-#if _SOLAR__PRIVATE
-voidImpCheckEditEngine( sal_Bool bKeepNewText );
-#endif
-protected:
-virtual voidMouseButtonDown( const MouseEvent rMEvt );
-virtual voidMouseButtonUp( const MouseEvent rMEvt );
-virtual voidMouseMove( const MouseEvent rMEvt );
-virtual voidLoseFocus();
-virtual voidKeyInput( const KeyEvent rKEvent );
-virtual voidPaint( const Rectangle );
-
-virtual sal_BoolStartRenamingTab( sal_uInt16 nCurId );
-virtual sal_BoolAllowRenamingTab( sal_uInt16 nCurId, const String 
rNewName );
-virtual voidTabRenamed( sal_uInt16 nCurId, const String rNewName );
-
-public:
-ExtendedTabBar( Window* pParent, WinBits nStyle );
-~ExtendedTabBar();
-
-voidRenameSelectedTab();
-sal_BoolIsInEditMode() const { return pEditEngine ? sal_True : 
sal_False; }
-voidStopEditMode( sal_Bool bKeepCurText = sal_False );
-};
-
-#endif  //_BASTYPE4_HXX
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source tools/Library_tl.mk tools/Package_inc.mk tools/inc tools/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source dbaccess/source sw/source

[Libreoffice-commits] .: basctl/source basic/source sc/source sw/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source officecfg/registry

[Libreoffice-commits] .: basctl/source

[Libreoffice-commits] .: basctl/source

31 matches

Site Navigation

Mail list logo

Footer information