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

[Libreoffice-commits] .: basctl/source

2013-01-11 Thread Libreoffice Gerrit user

 basctl/source/basicide/baside2b.cxx |   16 
 basctl/source/basicide/layout.cxx   |5 +++--
 basctl/source/basicide/linenumberwindow.cxx |3 ++-
 3 files changed, 13 insertions(+), 11 deletions(-)

New commits:
commit 200e0c8d88fc68defebbd7b79fd4d1d2e1b9c6bd
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sat Jan 12 06:39:31 2013 +0100

fix a bunch of more crashes when setting personas

Change-Id: I6c2c398e074a41c3173bff57bc12496b4c2032b4

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index e4d7350..ffa93e4 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -666,8 +666,8 @@ void EditorWindow::DataChanged(DataChangedEvent const  
rDCEvt)
  (rDCEvt.GetFlags()  SETTINGS_STYLE) != 0)
 {
 Color aColor(GetSettings().GetStyleSettings().GetFieldColor());
-if (aColor
-!= rDCEvt.GetOldSettings()-GetStyleSettings().GetFieldColor())
+const AllSettings* pOldSettings = rDCEvt.GetOldSettings();
+if (!pOldSettings || aColor != 
pOldSettings-GetStyleSettings().GetFieldColor())
 {
 SetBackground(Wallpaper(aColor));
 Invalidate();
@@ -675,8 +675,8 @@ void EditorWindow::DataChanged(DataChangedEvent const  
rDCEvt)
 if (pEditEngine != 0)
 {
 aColor = GetSettings().GetStyleSettings().GetFieldTextColor();
-if (aColor != rDCEvt.GetOldSettings()-
-GetStyleSettings().GetFieldTextColor())
+if (!pOldSettings || aColor !=
+pOldSettings- GetStyleSettings().GetFieldTextColor())
 {
 Font aFont(pEditEngine-GetFont());
 aFont.SetColor(aColor);
@@ -1166,8 +1166,8 @@ void BreakPointWindow::DataChanged(DataChangedEvent const 
 rDCEvt)
  (rDCEvt.GetFlags()  SETTINGS_STYLE) != 0)
 {
 Color aColor(GetSettings().GetStyleSettings().GetFieldColor());
-if (aColor
-!= rDCEvt.GetOldSettings()-GetStyleSettings().GetFieldColor())
+const AllSettings* pOldSettings = rDCEvt.GetOldSettings();
+if (!pOldSettings || aColor != 
pOldSettings-GetStyleSettings().GetFieldColor())
 {
 setBackgroundColor(aColor);
 Invalidate();
@@ -1690,8 +1690,8 @@ void ComplexEditorWindow::DataChanged(DataChangedEvent 
const  rDCEvt)
  (rDCEvt.GetFlags()  SETTINGS_STYLE) != 0)
 {
 Color aColor(GetSettings().GetStyleSettings().GetFaceColor());
-if (aColor
-!= rDCEvt.GetOldSettings()-GetStyleSettings().GetFaceColor())
+const AllSettings* pOldSettings = rDCEvt.GetOldSettings();
+if (!pOldSettings || aColor != 
pOldSettings-GetStyleSettings().GetFaceColor())
 {
 SetBackground(Wallpaper(aColor));
 Invalidate();
diff --git a/basctl/source/basicide/layout.cxx 
b/basctl/source/basicide/layout.cxx
index e679a4f..344345f 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -135,13 +135,14 @@ void Layout::DataChanged (DataChangedEvent const rDCEvt)
 {
 bool bInvalidate = false;
 Color aColor = GetSettings().GetStyleSettings().GetWindowColor();
-if (aColor != 
rDCEvt.GetOldSettings()-GetStyleSettings().GetWindowColor())
+const AllSettings* pOldSettings = rDCEvt.GetOldSettings();
+if (!pOldSettings || aColor != 
pOldSettings-GetStyleSettings().GetWindowColor())
 {
 SetBackground(Wallpaper(aColor));
 bInvalidate = true;
 }
 aColor = GetSettings().GetStyleSettings().GetWindowTextColor();
-if (aColor != 
rDCEvt.GetOldSettings()-GetStyleSettings().GetWindowTextColor())
+if (!pOldSettings || aColor != 
pOldSettings-GetStyleSettings().GetWindowTextColor())
 {
 Font aFont(GetFont());
 aFont.SetColor(aColor);
diff --git a/basctl/source/basicide/linenumberwindow.cxx 
b/basctl/source/basicide/linenumberwindow.cxx
index 6e81075..79edc16 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -98,7 +98,8 @@ void LineNumberWindow::DataChanged(DataChangedEvent const  
rDCEvt)
  (rDCEvt.GetFlags()  SETTINGS_STYLE) != 0)
 {
 Color aColor(GetSettings().GetStyleSettings().GetFieldColor());
-if (aColor != 
rDCEvt.GetOldSettings()-GetStyleSettings().GetFieldColor())
+const AllSettings* pOldSettings = rDCEvt.GetOldSettings();
+if (!pOldSettings || aColor != 
pOldSettings-GetStyleSettings().GetFieldColor())
 {
 SetBackground(Wallpaper(aColor));
 Invalidate();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2013-01-03 Thread Libreoffice Gerrit user

 basctl/source/basicide/moduldl2.cxx |   14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

New commits:
commit f6b4d0313dbaf1089254a1bfae9ccfbc3f413eb3
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Sat Dec 29 11:39:23 2012 -0200

fdo#57950: Remove chained append and simplify strings

No need to two strings here, since just destFolder is used.

Change-Id: Ie1bfd5744113764caaec11d9fb9c771f9c67e1c4
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
Signed-off-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz

diff --git a/basctl/source/basicide/moduldl2.cxx 
b/basctl/source/basicide/moduldl2.cxx
index 1fd2e47..d846bf3 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1314,14 +1314,12 @@ void LibPage::ExportAsPackage( const String aLibName )
 
 ::ucbhelper::Content sourceContent( aSourcePath, xCmdEnv, 
comphelper::getProcessComponentContext() );
 
-OUStringBuffer buf;
-buf.appendAscii( vnd.sun.star.zip:// );
-buf.append( ::rtl::Uri::encode( aPackageURL,
-rtl_UriCharClassRegName,
-rtl_UriEncodeIgnoreEscapes,
-RTL_TEXTENCODING_UTF8 ) );
-buf.append( static_castsal_Unicode('/') );
-OUString destFolder( buf.makeStringAndClear() );
+OUString destFolder = vnd.sun.star.zip:// +
+  ::rtl::Uri::encode( aPackageURL,
+  rtl_UriCharClassRegName,
+  rtl_UriEncodeIgnoreEscapes,
+  RTL_TEXTENCODING_UTF8 ) +
+  /;
 
 if( xSFA-exists( aPackageURL ) )
 xSFA-kill( aPackageURL );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2012-12-31 Thread Libreoffice Gerrit user

 basctl/source/basicide/basobj2.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e4429d43f55c52f16130a745d428b89cbf2f0394
Author: Radu Ioan ioan.rad...@gmail.com
Date:   Mon Dec 31 02:53:06 2012 +0200

fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT

Changed some OSL_ and DBG_ to SAL_

Change-Id: I192994238b949ffc51697a356a2f49072d5cedb2
Reviewed-on: https://gerrit.libreoffice.org/1519
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi

diff --git a/basctl/source/basicide/basobj2.cxx 
b/basctl/source/basicide/basobj2.cxx
index 25d43a0..6fac397 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -66,7 +66,7 @@ extern C {
 }
 SAL_DLLPUBLIC_EXPORT void basicide_macro_organizer( sal_Int16 nTabId )
 {
-OSL_TRACE(in basicide_macro_organizer);
+SAL_INFO(basctl.basicide,in basicide_macro_organizer);
 basctl::Organize( nTabId );
 }
 }
@@ -165,7 +165,7 @@ bool RenameModule (
 {
 if ( !rDocument.hasModule( rLibName, rOldName ) )
 {
-OSL_FAIL( basctl::RenameModule: old module name is invalid! );
+SAL_WARN( basctl.basicide,basctl::RenameModule: old module name is 
invalid! );
 return false;
 }
 
@@ -199,7 +199,7 @@ bool RenameModule (
 
 // update tabwriter
 sal_uInt16 nId = pShell-GetWindowId( pWin );
-DBG_ASSERT( nId, No entry in Tabbar! );
+SAL_WARN_IF( nId == 0 , basctl.basicide , No entry in Tabbar!);
 if ( nId )
 {
 TabBar rTabBar = pShell-GetTabBar();
@@ -243,7 +243,7 @@ namespace
 // take ownership of the data
 ::std::auto_ptr MacroExecutionData  pData( i_pData );
 
-DBG_ASSERT( pData-xMethod-GetParent()-GetFlags()  SBX_EXTSEARCH, 
Kein EXTSEARCH! );
+SAL_WARN_IF( !(pData-xMethod-GetParent()-GetFlags()  
SBX_EXTSEARCH), basctl.basicide,No EXTSEARCH! );
 
 // in case this is a document-local macro, try to protect the 
document's Undo Manager from
 // flawed scripts
@@ -349,7 +349,7 @@ OUString ChooseMacro( const uno::Reference frame::XModel 
 rxLimitToDocument,
 xLimitToDocument.set( xScripts, UNO_QUERY );
 if ( !xLimitToDocument.is() )
 {
-OSL_ENSURE( false, basctl::ChooseMacro: a 
script container which is no document!? );
+SAL_WARN_IF(!xLimitToDocument.is(), 
basctl.basicide, basctl::ChooseMacro: a script container which is no 
document!? );
 xLimitToDocument = rxLimitToDocument;
 }
 }
@@ -423,7 +423,7 @@ Sequence OUString  GetMethodNames( const ScriptDocument 
rDocument, const OUSt
 SbMethod* pMethod = (SbMethod*)xModule-GetMethods()-Get( i );
 if( pMethod-IsHidden() )
 continue;
-DBG_ASSERT( pMethod, Method not found! (NULL) );
+SAL_WARN_IF( !pMethod, basctl.basicide,Method not found! 
(NULL) );
 aSeqMethods.getArray()[ iTarget++ ] = pMethod-GetName();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2012-12-29 Thread Libreoffice Gerrit user

 basctl/source/basicide/moduldl2.cxx   |4 ++--
 basctl/source/basicide/scriptdocument.cxx |6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 1d1abd28c2d4aab7c6ccfe94e49bd974fa5982bf
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Sat Dec 29 11:32:51 2012 -0200

Remove last usage of RTL_CONSTASCII_STRINGPARAM in basctl

Change-Id: I5bc79699e794de47611d785b9ae48b4badf9f2f6
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/1502
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br

diff --git a/basctl/source/basicide/moduldl2.cxx 
b/basctl/source/basicide/moduldl2.cxx
index 3245042..1fd2e47 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -288,7 +288,7 @@ sal_Bool CheckBox::EditingEntry( SvTreeListEntry* pEntry, 
Selection )
 
 // check, if Standard library
 OUString aLibName = GetEntryText( pEntry, 0 );
-if ( aLibName.equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( 
Standard ) ) )
+if ( aLibName.equalsIgnoreAsciiCase( Standard ) )
 {
 ErrorBox( this, WB_OK | WB_DEF_OK, 
IDE_RESSTR(RID_STR_CANNOTCHANGENAMESTDLIB) ).Execute();
 return false;
@@ -572,7 +572,7 @@ void LibPage::CheckButtons()
 aInsertLibButton.Disable();
 aDelButton.Disable();
 }
-else if ( aLibName.equalsIgnoreAsciiCaseAsciiL( 
RTL_CONSTASCII_STRINGPARAM( Standard ) ) )
+else if ( aLibName.equalsIgnoreAsciiCase( Standard ) )
 {
 aPasswordButton.Disable();
 aNewLibButton.Enable();
diff --git a/basctl/source/basicide/scriptdocument.cxx 
b/basctl/source/basicide/scriptdocument.cxx
index c1256b5..b184974 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -942,14 +942,14 @@ namespace basctl
 Reference XUriReference  xUriRef( xUriFac-parse( aLinkURL ), 
UNO_QUERY_THROW );
 
 OUString aScheme = xUriRef-getScheme();
-if ( 
aScheme.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(file)) )
+if ( aScheme.equalsIgnoreAsciiCase(file) )
 {
 aFileURL = aLinkURL;
 }
-else if ( 
aScheme.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(vnd.sun.star.pkg))
 )
+else if ( aScheme.equalsIgnoreAsciiCase(vnd.sun.star.pkg) )
 {
 OUString aAuthority = xUriRef-getAuthority();
-if ( 
aAuthority.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(vnd.sun.star.expand:))
 )
+if ( aAuthority.matchIgnoreAsciiCase(vnd.sun.star.expand:) )
 {
 OUString aDecodedURL( aAuthority.copy( sizeof ( 
vnd.sun.star.expand: ) - 1 ) );
 aDecodedURL = ::rtl::Uri::decode( aDecodedURL, 
rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2012-12-27 Thread Libreoffice Gerrit user

 basctl/source/basicide/baside2.cxx |9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 47139512bc5df08704fd9df362c7de86b99fe7e8
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Wed Dec 26 14:44:52 2012 -0200

fdo#57950: remove consecutive append in basctl with StringBuffer

Change-Id: I43464dd702c6b4a63df39b6a4b35bec63712d5e6
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/1486
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index fa9d50e..c6c3545 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -134,13 +134,8 @@ void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 
nPages, sal_uInt16 nCurPage,
 
 if( bOutput )
 {
-OUStringBuffer aPageStr;
-aPageStr.appendAscii(  [ );
-aPageStr.append(IDE_RESSTR(RID_STR_PAGE));
-aPageStr.append(' ');
-aPageStr.append( nCurPage );
-aPageStr.append(']');
-pPrinter-DrawText( aPos, aPageStr.makeStringAndClear() );
+OUString aPageStr =  [ + IDE_RESSTR(RID_STR_PAGE) +   + 
OUString::valueOf( nCurPage ) + ];
+pPrinter-DrawText( aPos, aPageStr );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source codemaker/source sw/source xmloff/source

2012-12-18 Thread Libreoffice Gerrit user

 basctl/source/basicide/bastype3.cxx |8 +---
 basctl/source/basicide/bastypes.cxx |   11 ---
 codemaker/source/javamaker/javatype.cxx |6 +-
 sw/source/filter/ww8/docxexport.cxx |6 ++
 sw/source/filter/ww8/ww8graf.cxx|7 ++-
 xmloff/source/core/RDFaExportHelper.cxx |7 +--
 6 files changed, 11 insertions(+), 34 deletions(-)

New commits:
commit 5198c4a41f9cb793abd1276e75a640f7391ce0c3
Author: Christos Strubulis strubu...@gmail.com
Date:   Tue Dec 18 06:59:28 2012 -0800

Replace chained O(U)StringBuffer::append() with operator+

Change-Id: I0fcd70cff092c7d90b57b9af9dcec99f23750f1c
Signed-off-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz

diff --git a/basctl/source/basicide/bastype3.cxx 
b/basctl/source/basicide/bastype3.cxx
index 194d52d..db15a6a 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -455,13 +455,7 @@ SvTreeListEntry* TreeListBox::FindRootEntry( const 
ScriptDocument rDocument, Li
 
 OUString CreateMgrAndLibStr( const OUString rMgrName, const OUString 
rLibName )
 {
-OUStringBuffer aName;
-aName.append('[');
-aName.append(rMgrName);
-aName.append(']');
-aName.append('.');
-aName.append(rLibName);
-return aName.makeStringAndClear();
+return [ + rMgrName + ]. + rLibName;
 }
 
 
diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index 461044c..340ea40 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -183,17 +183,14 @@ OUString BaseWindow::GetTitle()
 
 OUString BaseWindow::CreateQualifiedName()
 {
-OUStringBuffer aName;
+OUString aName;
 if ( !m_aLibName.isEmpty() )
 {
 LibraryLocation eLocation = m_aDocument.getLibraryLocation( m_aLibName 
);
-aName.append(m_aDocument.getTitle(eLocation));
-aName.append('.');
-aName.append(m_aLibName);
-aName.append('.');
-aName.append(GetTitle());
+aName = m_aDocument.getTitle(eLocation) + . + m_aLibName + . +
+GetTitle();
 }
-return aName.makeStringAndClear();
+return aName;
 }
 
 void BaseWindow::SetReadOnly (bool)
diff --git a/codemaker/source/javamaker/javatype.cxx 
b/codemaker/source/javamaker/javatype.cxx
index b0edb7f..5b8748e 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -855,11 +855,7 @@ void handleEnumType(
 rtl::OString(RTL_CONSTASCII_STRINGPARAM(com/sun/star/uno/Enum)),
 rtl::OString()));
 SAL_WNODEPRECATED_DECLARATIONS_POP
-rtl::OStringBuffer buf;
-buf.append('L');
-buf.append(className);
-buf.append(';');
-rtl::OString classDescriptor(buf.makeStringAndClear());
+rtl::OString classDescriptor(L + className + ;);
 {for (sal_uInt16 i = 0; i  fields; ++i) {
 RTConstValue fieldValue(reader.getFieldValue(i));
 if (fieldValue.m_type != RT_TYPE_INT32
diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 59e9bd1..1b3c8f8 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -294,14 +294,12 @@ void DocxExport::DoFormText(const SwInputField* /*pFld*/)
 
 rtl::OString DocxExport::OutputChart( uno::Reference frame::XModel  xModel, 
sal_Int32 nCount )
 {
-rtl::OUString aFileName = 
rtl::OUStringBuffer().append(charts/chart).append(nCount).append(.xml).makeStringAndClear();
-
+OUString aFileName = charts/chart + OUString::valueOf(nCount) + .xml;
 OUString sId = m_pFilter-addRelation( m_pDocumentFS-getOutputStream(),
 
http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart;,
 aFileName );
 
-aFileName = 
rtl::OUStringBuffer().append(word/charts/chart).append(nCount).append(.xml).makeStringAndClear();
-
+aFileName = word/charts/chart + OUString::valueOf(nCount) + .xml;
 ::sax_fastparser::FSHelperPtr pChartFS =
 m_pFilter-openFragmentStreamWithSerializer( aFileName,
 application/vnd.openxmlformats-officedocument.drawingml.chart );
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index c432363..da4cae6 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -154,11 +154,8 @@ void wwFrameNamer::SetUniqueGraphName(SwFrmFmt *pFrmFmt, 
const rtl::OUString rF
 {
 if (mbIsDisabled || rFixed.isEmpty())
 return;
-rtl::OUStringBuffer aName(msSeed);
-aName.append(++mnImportedGraphicsCount);
-aName.append(: );
-aName.append(rFixed);
-pFrmFmt-SetName(aName.makeStringAndClear());
+
+pFrmFmt-SetName(msSeed+OUString::valueOf(++mnImportedGraphicsCount) + : 
 + rFixed);
 }
 
 // ReadGrafStart liest die ObjektDaten ein und erzeugt falls noetig einen Anker
diff --git a/xmloff/source/core/RDFaExportHelper.cxx 
b/xmloff/source/core/RDFaExportHelper.cxx
index

[Libreoffice-commits] .: basctl/source

2012-12-04 Thread Libreoffice Gerrit user

 basctl/source/basicide/unomodel.cxx |   24 
 basctl/source/basicide/unomodel.hxx |   12 
 2 files changed, 36 insertions(+)

New commits:
commit ab96b65e0d4fab541d8b31b46e3f37db0fb548b5
Author: Noel Power noel.po...@suse.com
Date:   Tue Dec 4 10:53:56 2012 +

fix for fdo#57836 throw when attempting to store basicide model

Change-Id: I8769a63be61d45817757be3ad23ffc7b01173041

diff --git a/basctl/source/basicide/unomodel.cxx 
b/basctl/source/basicide/unomodel.cxx
index 0ee8f3a..1b6122c 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.cxx
@@ -117,6 +117,30 @@ uno::Reference uno::XInterface  SAL_CALL 
SIDEModel_createInstance(
 return uno::Reference uno::XInterface ( pShell-GetModel() );
 }
 
+//  XStorable
+void SAL_CALL SIDEModel::store() throw (io::IOException, uno::RuntimeException)
+{
+notImplemented();
+}
+
+void SAL_CALL SIDEModel::storeAsURL( const ::rtl::OUString, const 
uno::Sequence PROPERTYVALUE  )
+throw (io::IOException, uno::RuntimeException)
+{
+notImplemented();
+}
+
+void SAL_CALL SIDEModel::storeToURL( const ::rtl::OUString,
+const uno::Sequence PROPERTYVALUE  )
+throw (io::IOException, uno::RuntimeException)
+{
+notImplemented();
+}
+
+void  SIDEModel::notImplemented() throw ( io::IOException )
+{
+throw io::IOException(Can't store IDE model, uno::Reference 
uno::XInterface () );
+}
+
 } // namespace basctl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/unomodel.hxx 
b/basctl/source/basicide/unomodel.hxx
index 87b230a..4d6fd0c 100644
--- a/basctl/source/basicide/unomodel.hxx
+++ b/basctl/source/basicide/unomodel.hxx
@@ -30,6 +30,7 @@ namespace basctl
 class SIDEModel : public SfxBaseModel,
 public com::sun::star::lang::XServiceInfo
 {
+void notImplemented() throw ( ::com::sun::star::io::IOException );
 public:
 SIDEModel( SfxObjectShell *pObjSh = 0 );
 virtual ~SIDEModel();
@@ -49,6 +50,17 @@ public:
 throw( ::com::sun::star::uno::RuntimeException );
 virtual ::com::sun::star::uno::Sequence OUString  SAL_CALL 
getSupportedServiceNames(void)
 throw( ::com::sun::star::uno::RuntimeException );
+// XStorable2
+virtual void SAL_CALL storeSelf( const  ::com::sun::star::uno::Sequence 
PROPERTYVALUE  )
+throw (::com::sun::star::lang::IllegalArgumentException, 
::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { 
notImplemented(); }
+//  XStorable
+virtual void SAL_CALL store() throw (::com::sun::star::io::IOException, 
::com::sun::star::uno::RuntimeException);
+virtual void SAL_CALL storeAsURL(   const   ::rtl::OUString sURL,
+const   ::com::sun::star::uno::Sequence PROPERTYVALUE
seqArguments)
+throw (::com::sun::star::io::IOException, 
::com::sun::star::uno::RuntimeException);
+virtual void SAL_CALL storeToURL(   const   ::rtl::OUString sURL,
+const   ::com::sun::star::uno::Sequence PROPERTYVALUE
seqArguments)
+throw (::com::sun::star::io::IOException, 
::com::sun::star::uno::RuntimeException);
 
 static ::com::sun::star::uno::Sequence OUString  
getSupportedServiceNames_Static();
 static OUString getImplementationName_Static();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source cui/source sfx2/inc svx/inc svx/source sw/source tools/inc unotools/inc vcl/inc

2012-11-20 Thread Libreoffice Gerrit user

 basctl/source/basicide/basides1.cxx|2 --
 basctl/source/basicide/basides3.cxx|2 --
 basctl/source/basicide/basidesh.cxx|1 -
 basctl/source/inc/basidesh.hxx |2 --
 cui/source/inc/dlgname.hxx |   10 --
 cui/source/inc/linkdlg.hxx |2 --
 cui/source/inc/macropg.hxx |4 
 cui/source/inc/transfrm.hxx|4 
 sfx2/inc/inettbc.hxx   |5 +
 sfx2/inc/sfx2/docfile.hxx  |4 
 sfx2/inc/sfx2/macropg.hxx  |4 ++--
 sfx2/inc/sfx2/viewsh.hxx   |2 --
 svx/inc/svdibrow.hxx   |4 ++--
 svx/source/tbxctrls/colorwindow.hxx|2 --
 svx/source/tbxctrls/tbcontrl.cxx   |4 
 sw/source/ui/inc/docfnote.hxx  |2 --
 tools/inc/tools/solar.h|5 -
 unotools/inc/unotools/ucblockbytes.hxx |2 --
 vcl/inc/impbmp.hxx |4 
 vcl/inc/vcl/syswin.hxx |2 --
 vcl/inc/vcl/timer.hxx  |2 --
 21 files changed, 9 insertions(+), 60 deletions(-)

New commits:
commit 56d3de7360434e4f15d7bd92d50888e8bc092ad6
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Nov 20 13:55:16 2012 +0200

Bin pointless _SOLAR__PRIVATE which was always 1 anyway

Change-Id: I98f35920f02d4ee71787a9968158b220af69bde6

diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index 42644e5..85da8ae 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#define _SOLAR__PRIVATE 1
-
 #include basidesh.hrc
 #include helpid.hrc
 
diff --git a/basctl/source/basicide/basides3.cxx 
b/basctl/source/basicide/basides3.cxx
index 5d043ea..8d0b70d 100644
--- a/basctl/source/basicide/basides3.cxx
+++ b/basctl/source/basicide/basides3.cxx
@@ -19,8 +19,6 @@
 
 #include basidesh.hrc
 
-#define _SOLAR__PRIVATE 1
-
 #include basidesh.hxx
 #include baside2.hxx
 #include baside3.hxx
diff --git a/basctl/source/basicide/basidesh.cxx 
b/basctl/source/basicide/basidesh.cxx
index ed86cca..812ca41 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -22,7 +22,6 @@
 
 #include basidesh.hxx
 
-#define _SOLAR__PRIVATE 1
 #include tools/diagnose_ex.h
 #include basic/basmgr.hxx
 #include basidesh.hrc
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index be34a78..e093680 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -95,7 +95,6 @@ private:
 friend class ContainerListenerImpl;
 ::com::sun::star::uno::Reference 
::com::sun::star::container::XContainerListener  m_xLibListener;
 
-#if _SOLAR__PRIVATE
 voidInit();
 voidInitTabBar();
 voidInitScrollBars();
@@ -113,7 +112,6 @@ private:
 
 DECL_LINK( TabBarHdl, TabBar* );
 DECL_LINK( TabBarSplitHdl, TabBar * );
-#endif
 
 static unsigned nShellCount;
 
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index 35c065d..de64052 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -39,9 +39,8 @@ private:
 HelpButton  aBtnHelp;
 
 LinkaCheckNameHdl;
-#if _SOLAR__PRIVATE
+
 DECL_LINK(ModifyHdl, void *);
-#endif
 
 public:
 SvxNameDialog( Window* pWindow, const String rName, const String rDesc );
@@ -93,9 +92,8 @@ private:
 
 // callback link for name uniqueness
 LinkaCheckNameHdl;
-#if _SOLAR__PRIVATE
+
 DECL_LINK(ModifyHdl, void *);
-#endif
 
 public:
 // constructor
@@ -156,10 +154,10 @@ private:
 CancelButtonaBtnCancel;
 FixedImage  aFtImage;
 Image*  pImage;
-#if _SOLAR__PRIVATE
+
 DECL_LINK(Button1Hdl, void *);
 DECL_LINK(Button2Hdl, void *);
-#endif
+
 public:
 SvxMessDialog( Window* pWindow, const String rText, const String rDesc, 
Image* pImg = NULL );
 ~SvxMessDialog();
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index 1c75302..e5d928d 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -73,7 +73,6 @@ class SvBaseLinksDlg : public ModalDialog
 sal_BoolbHtmlMode;
 Timer aUpdateTimer;
 
-#if _SOLAR__PRIVATE
 DECL_LINK( LinksSelectHdl, SvTabListBox * );
 DECL_LINK( LinksDoubleClickHdl, SvTabListBox * );
 DECL_LINK( AutomaticClickHdl, RadioButton * );
@@ -88,7 +87,6 @@ class SvBaseLinksDlg : public ModalDialog
 String ImplGetStateStr( const sfx2::SvBaseLink );
 void SetType( sfx2::SvBaseLink rLink, sal_uInt16 nPos, sal_uInt16 nType );
 void InsertEntry( const sfx2::SvBaseLink rLink, sal_uInt16 nPos = 
LISTBOX_APPEND, sal_Bool bSelect = sal_False);
-#endif
 
 void StartUpdateTimer() { aUpdateTimer.Start(); }
 
diff --git a/cui/source/inc/macropg.hxx

[Libreoffice-commits] .: basctl/source basic/source drawinglayer/source editeng/source svl/inc svl/source svtools/source sw/source vcl/source xmloff/source

2012-10-29 Thread Libreoffice Gerrit user

 basctl/source/basicide/baside2.cxx |9 ++-
 basic/source/runtime/methods.cxx   |   24 +-
 basic/source/runtime/step0.cxx |   28 ++--
 basic/source/runtime/step2.cxx |8 ++-
 drawinglayer/source/processor2d/vclprocessor2d.cxx |8 ++-
 editeng/source/editeng/impedit3.cxx|7 +--
 svl/inc/svl/zformat.hxx|   11 ++--
 svl/source/numbers/zformat.cxx |   49 +++--
 svtools/source/control/fmtfield.cxx|7 +--
 sw/source/core/crsr/crstrvl.cxx|   20 +++-
 sw/source/core/fields/authfld.cxx  |7 +--
 sw/source/core/text/porglue.cxx|7 +--
 sw/source/filter/ww8/ww8graf.cxx   |8 +--
 sw/source/filter/ww8/ww8par2.cxx   |5 +-
 sw/source/ui/uiview/srcview.cxx|7 +--
 vcl/source/control/edit.cxx|6 +-
 xmloff/source/style/xmlnumfe.cxx   |   10 ++--
 xmloff/source/style/xmlnumfi.cxx   |6 +-
 18 files changed, 119 insertions(+), 108 deletions(-)

New commits:
commit 4a11a47103fcbd7646234fc9565a409b8055507e
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Oct 30 00:00:51 2012 +

trivial empty-init String::Fill - comphelper::padToLength

Change-Id: I6c41b8f4d3ad739eff545063bd1f8fe8f4fba65e

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index 657182d..fa9d50e 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -37,6 +37,7 @@
 #include com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp
 #include com/sun/star/ui/dialogs/XFilterManager.hpp
 #include comphelper/processfactory.hxx
+#include comphelper/string.hxx
 #include sfx2/dinfdlg.hxx
 #include sfx2/dispatch.hxx
 #include sfx2/docfile.hxx
@@ -164,13 +165,13 @@ void lcl_ConvertTabsToSpaces( String rLine )
 if ( rLine.GetChar( nPos ) == '\t' )
 {
 // not 4 Blanks, but at 4 TabPos:
-String aBlanker;
-aBlanker.Fill( ( 4 - ( nPos % 4 ) ), ' ' );
+rtl::OUStringBuffer aBlanker;
+string::padToLength(aBlanker, ( 4 - ( nPos % 4 ) ), ' ');
 rLine.Erase( nPos, 1 );
-rLine.Insert( aBlanker, nPos );
+rLine.Insert( aBlanker.makeStringAndClear(), nPos );
 nMax = rLine.Len();
 }
-nPos++;
+++nPos;
 }
 }
 }
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 054de26..8c510e4 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1138,7 +1138,7 @@ RTLFUNC(LTrim)
 StarBASIC::Error( SbERR_BAD_ARGUMENT );
 else
 {
-rtl::OUString 
aStr(comphelper::string::stripStart(rPar.Get(1)-GetString(), ' '));
+rtl::OUString aStr(string::stripStart(rPar.Get(1)-GetString(), ' '));
 rPar.Get(0)-PutString(aStr);
 }
 }
@@ -1387,7 +1387,7 @@ RTLFUNC(RTrim)
 StarBASIC::Error( SbERR_BAD_ARGUMENT );
 else
 {
-rtl::OUString 
aStr(comphelper::string::stripEnd(rPar.Get(1)-GetString(), ' '));
+rtl::OUString aStr(string::stripEnd(rPar.Get(1)-GetString(), ' '));
 rPar.Get(0)-PutString(aStr);
 }
 }
@@ -1420,9 +1420,9 @@ RTLFUNC(Space)
 StarBASIC::Error( SbERR_BAD_ARGUMENT );
 else
 {
-String aStr;
-aStr.Fill( (sal_uInt16)(rPar.Get(1)-GetLong() ));
-rPar.Get(0)-PutString( aStr );
+rtl::OUStringBuffer aBuf;
+string::padToLength(aBuf, rPar.Get(1)-GetLong(), ' ');
+rPar.Get(0)-PutString(aBuf.makeStringAndClear());
 }
 }
 
@@ -1435,9 +1435,9 @@ RTLFUNC(Spc)
 StarBASIC::Error( SbERR_BAD_ARGUMENT );
 else
 {
-String aStr;
-aStr.Fill( (sal_uInt16)(rPar.Get(1)-GetLong() ));
-rPar.Get(0)-PutString( aStr );
+rtl::OUStringBuffer aBuf;
+string::padToLength(aBuf, rPar.Get(1)-GetLong(), ' ');
+rPar.Get(0)-PutString(aBuf.makeStringAndClear());
 }
 }
 
@@ -1578,7 +1578,6 @@ RTLFUNC(String)
 StarBASIC::Error( SbERR_BAD_ARGUMENT );
 else
 {
-String aStr;
 sal_Unicode aFiller;
 sal_Int32 lCount = rPar.Get(1)-GetLong();
 if( lCount  0 || lCount  0x )
@@ -1591,8 +1590,9 @@ RTLFUNC(String)
 const String rStr = rPar.Get(2)-GetString();
 aFiller = rStr.GetBuffer()[0];
 }
-aStr.Fill( nCount, aFiller );
-rPar.Get(0)-PutString( aStr );
+rtl::OUStringBuffer aBuf;
+string::padToLength(aBuf, nCount, aFiller);
+rPar.Get(0)-PutString(aBuf.makeStringAndClear());
 }
 }
 
@@ -2372,7 +2372,7 @@ String implSetupWildcard( const String rFileParam, 
SbiRTLData*

[Libreoffice-commits] .: basctl/source

2012-10-27 Thread Libreoffice Gerrit user

 basctl/source/inc/basobj.hxx |   40 ++---
 basctl/source/inc/scriptdocument.hxx |   66 ---
 2 files changed, 51 insertions(+), 55 deletions(-)

New commits:
commit fe6913b9687cb80a821e103e2756a6ada08a0b3a
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Fri Oct 26 22:41:53 2012 -0200

OUString cleanup and some identation

Change-Id: Id222047750b7527e35977b73213ceeb12a53b57a
Reviewed-on: https://gerrit.libreoffice.org/924
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index 16481f7..99bd6b0 100644
--- a/basctl/source/inc/basobj.hxx
+++ b/basctl/source/inc/basobj.hxx
@@ -39,28 +39,28 @@ namespace basctl
 
 
 // help methods for the general use:
-SbMethod*   CreateMacro( SbModule* pModule, const String rMacroName );
+SbMethod*   CreateMacro( SbModule* pModule, const String rMacroName );
 voidRunMethod( SbMethod* pMethod );
 
-StarBASIC*  FindBasic( const SbxVariable* pVar );
+StarBASIC*  FindBasic( const SbxVariable* pVar );
 voidStopBasic();
-long HandleBasicError( StarBASIC* pBasic );
+longHandleBasicError( StarBASIC* pBasic );
 voidBasicStopped( bool* pbAppWindowDisabled = 0, bool* 
pbDispatcherLocked = 0, sal_uInt16* pnWaitCount = 0,
 SfxUInt16Item** ppSWActionCount = 0, 
SfxUInt16Item** ppSWLockViewCount = 0 );
 
 boolIsValidSbxName( const String rName );
 
-BasicManager*   FindBasicManager( StarBASIC* pLib );
+BasicManager*   FindBasicManager( StarBASIC* pLib );
 
-SfxBindings*GetBindingsPtr();
+SfxBindings*GetBindingsPtr();
 
-SfxDispatcher*  GetDispatcher ();
+SfxDispatcher*  GetDispatcher ();
 
 voidInvalidateDebuggerSlots();
 
 // libraries
 
-::com::sun::star::uno::Sequence ::rtl::OUString  GetMergedLibraryNames(
+::com::sun::star::uno::Sequence OUString  GetMergedLibraryNames(
 const ::com::sun::star::uno::Reference 
::com::sun::star::script::XLibraryContainer  xModLibContainer,
 const ::com::sun::star::uno::Reference 
::com::sun::star::script::XLibraryContainer  xDlgLibContainer );
 
@@ -68,21 +68,22 @@ namespace basctl
 
 Will show an error message when renaming fails because the new name is 
already used.
 */
-bool RenameModule(
+boolRenameModule(
 Window* pErrorParent, const ScriptDocument rDocument,
-const ::rtl::OUString rLibName, const ::rtl::OUString rOldName, 
const ::rtl::OUString rNewName );
+const OUString rLibName, const OUString rOldName, const OUString 
rNewName );
 
 // new methods for macros
 
-::rtl::OUString ChooseMacro( const ::com::sun::star::uno::Reference 
::com::sun::star::frame::XModel  rxLimitToDocument,
-bool bChooseOnly, const ::rtl::OUString rMacroDesc );
+OUStringChooseMacro(
+const ::com::sun::star::uno::Reference 
::com::sun::star::frame::XModel  rxLimitToDocument,
+bool bChooseOnly, const OUString rMacroDesc );
 
-::com::sun::star::uno::Sequence ::rtl::OUString  GetMethodNames(
-const ScriptDocument rDocument, const ::rtl::OUString rLibName, 
const ::rtl::OUString rModName )
+::com::sun::star::uno::Sequence OUString  GetMethodNames(
+const ScriptDocument rDocument, const OUString rLibName, const 
OUString rModName )
 throw( ::com::sun::star::container::NoSuchElementException );
 
-boolHasMethod(
-const ScriptDocument rDocument, const ::rtl::OUString rLibName, 
const ::rtl::OUString rModName, const ::rtl::OUString rMethName );
+boolHasMethod(
+const ScriptDocument rDocument, const OUString rLibName, const 
OUString rModName, const OUString rMethName );
 
 // new methods for dialogs
 
@@ -90,14 +91,13 @@ namespace basctl
 
 Will show an error message when renaming fails because the new name is 
already used.
 */
-bool RenameDialog(
-Window* pErrorParent, const ScriptDocument rDocument, const 
::rtl::OUString rLibName, const ::rtl::OUString rOldName, const 
::rtl::OUString rNewName )
+boolRenameDialog(
+Window* pErrorParent, const ScriptDocument rDocument, const OUString 
rLibName, const OUString rOldName, const OUString rNewName )
 throw( ::com::sun::star::container::ElementExistException, 
::com::sun::star::container::NoSuchElementException );
 
-bool RemoveDialog(
-const ScriptDocument rDocument, const ::rtl::OUString rLibName, 
const ::rtl::OUString rDlgName );
+boolRemoveDialog( const ScriptDocument rDocument, const 
OUString rLibName, const OUString rDlgName );
 
-void

[Libreoffice-commits] .: basctl/source

2012-10-27 Thread Libreoffice Gerrit user

 basctl/source/inc/dlgeddef.hxx|   30 +++---
 basctl/source/inc/localizationmgr.hxx |   22 +++---
 basctl/source/inc/managelang.hxx  |   10 +-
 basctl/source/inc/propbrw.hxx |2 +-
 basctl/source/inc/sbxitem.hxx |   16 
 5 files changed, 40 insertions(+), 40 deletions(-)

New commits:
commit b596ce9bb1feafe5c09fa87582d96acceb6ae37d
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Fri Oct 26 23:35:24 2012 -0200

OUString cleanup finished in basctl

Change-Id: I6d18f5cde7866828ca95ccff702eb86d2e40c58d
Reviewed-on: https://gerrit.libreoffice.org/925
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/basctl/source/inc/dlgeddef.hxx b/basctl/source/inc/dlgeddef.hxx
index 16fb33e..ec06d6c 100644
--- a/basctl/source/inc/dlgeddef.hxx
+++ b/basctl/source/inc/dlgeddef.hxx
@@ -68,21 +68,21 @@ enum
 };
 
 // control properties
-#define DLGED_PROP_BACKGROUNDCOLOR   rtl::OUString(BackgroundColor)
-#define DLGED_PROP_DROPDOWN  rtl::OUString(Dropdown)
-#define DLGED_PROP_FORMATSSUPPLIER   rtl::OUString(FormatsSupplier)
-#define DLGED_PROP_HEIGHTrtl::OUString(Height)
-#define DLGED_PROP_LABEL rtl::OUString(Label)
-#define DLGED_PROP_NAME  rtl::OUString(Name)
-#define DLGED_PROP_ORIENTATION   rtl::OUString(Orientation)
-#define DLGED_PROP_POSITIONX rtl::OUString(PositionX)
-#define DLGED_PROP_POSITIONY rtl::OUString(PositionY)
-#define DLGED_PROP_STEP  rtl::OUString(Step)
-#define DLGED_PROP_TABINDEX  rtl::OUString(TabIndex)
-#define DLGED_PROP_TEXTCOLOR rtl::OUString(TextColor)
-#define DLGED_PROP_TEXTLINECOLOR rtl::OUString(TextLineColor)
-#define DLGED_PROP_WIDTH rtl::OUString(Width)
-#define DLGED_PROP_DECORATIONrtl::OUString(Decoration)
+#define DLGED_PROP_BACKGROUNDCOLOR   BackgroundColor
+#define DLGED_PROP_DROPDOWN  Dropdown
+#define DLGED_PROP_FORMATSSUPPLIER   FormatsSupplier
+#define DLGED_PROP_HEIGHTHeight
+#define DLGED_PROP_LABEL Label
+#define DLGED_PROP_NAME  Name
+#define DLGED_PROP_ORIENTATION   Orientation
+#define DLGED_PROP_POSITIONX PositionX
+#define DLGED_PROP_POSITIONY PositionY
+#define DLGED_PROP_STEP  Step
+#define DLGED_PROP_TABINDEX  TabIndex
+#define DLGED_PROP_TEXTCOLOR TextColor
+#define DLGED_PROP_TEXTLINECOLOR TextLineColor
+#define DLGED_PROP_WIDTH Width
+#define DLGED_PROP_DECORATIONDecoration
 
 
 } // namespace basctl
diff --git a/basctl/source/inc/localizationmgr.hxx 
b/basctl/source/inc/localizationmgr.hxx
index e3da88b..de471a3 100644
--- a/basctl/source/inc/localizationmgr.hxx
+++ b/basctl/source/inc/localizationmgr.hxx
@@ -38,7 +38,7 @@ class LocalizationMgr
 Shell*  m_pShell;
 
 ScriptDocument  m_aDocument;
-::rtl::OUString m_aLibName;
+OUStringm_aLibName;
 
 ::com::sun::star::lang::Locale  
m_aLocaleBeforeBasicStart;
 
@@ -53,7 +53,7 @@ class LocalizationMgr
 COPY_RESOURCES
 };
 static sal_Int32 implHandleControlResourceProperties( 
::com::sun::star::uno::Any aControlAny,
-const ::rtl::OUString aDialogName, const ::rtl::OUString 
aCtrlName,
+const OUString aDialogName, const OUString aCtrlName,
 ::com::sun::star::uno::Reference 
::com::sun::star::resource::XStringResourceManager 
 xStringResourceManager, ::com::sun::star::uno::Reference 
::com::sun::star::resource::
 XStringResourceResolver  xSourceStringResolver, 
HandleResourceMode eMode );
@@ -69,7 +69,7 @@ class LocalizationMgr
 void implEnableDisableResourceForAllLibraryDialogs( HandleResourceMode 
eMode );
 
 public:
-LocalizationMgr(Shell*, ScriptDocument const, rtl::OUString const 
aLibName,
+LocalizationMgr(Shell*, ScriptDocument const, OUString const aLibName,
 const ::com::sun::star::uno::Reference
  ::com::sun::star::resource::XStringResourceManager  
xStringResourceManager );
 ::com::sun::star::uno::Reference
@@ -97,21 +97,21 @@ public:
 void handleBasicStopped( void );
 
 static void setControlResourceIDsForNewEditorObject( DlgEditor* pEditor,
-::com::sun::star::uno::Any aControlAny, const ::rtl::OUString 
aCtrlName );
+::com::sun::star::uno::Any aControlAny, const OUString aCtrlName );
 
 static void renameControlResourceIDsForEditorObject( DlgEditor* pEditor,
-::com::sun::star::uno::Any aControlAny, const ::rtl::OUString 
aNewCtrlName );
+::com::sun::star::uno::Any aControlAny, const OUString aNewCtrlName );

[Libreoffice-commits] .: basctl/source

2012-10-26 Thread Libreoffice Gerrit user

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

New commits:
commit 008c0732ba2a5efd105c2287783d6768047d4289
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Mon Oct 22 22:22:43 2012 -0200

More ::rtl::OUString - OUString in basctl

Change-Id: Ia68b74d06ffe533bcc302fb5094267e0efae6faa
Reviewed-on: https://gerrit.libreoffice.org/901
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz

diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index 986a69b..a5f19ac 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -99,11 +99,11 @@ PropBrw::PropBrw (DialogWindowLayout rLayout_):
 try
 {
 // create a frame wrapper for myself
-m_xMeAsFrame = Reference XFrame 
(m_xORB-createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
com.sun.star.frame.Frame ))), UNO_QUERY);
+m_xMeAsFrame = Reference XFrame (m_xORB-createInstance( 
com.sun.star.frame.Frame ), UNO_QUERY);
 if (m_xMeAsFrame.is())
 {
 m_xMeAsFrame-initialize( VCLUnoHelper::GetInterface ( this ) );
-m_xMeAsFrame-setName(::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( form property browser )));  // change name!
+m_xMeAsFrame-setName( form property browser );  // change name!
 }
 }
 catch (const Exception)
@@ -133,15 +133,15 @@ void PropBrw::ImplReCreateController()
 // a ComponentContext for the
 ::cppu::ContextEntry_Init aHandlerContextInfo[] =
 {
-::cppu::ContextEntry_Init( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( DialogParentWindow ) ), makeAny( 
VCLUnoHelper::GetInterface ( this ) ) ),
-::cppu::ContextEntry_Init( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( ContextDocument ) ), makeAny( m_xContextDocument 
) )
+::cppu::ContextEntry_Init( DialogParentWindow, makeAny( 
VCLUnoHelper::GetInterface ( this ) ) ),
+::cppu::ContextEntry_Init( ContextDocument, makeAny( 
m_xContextDocument ) )
 };
 Reference XComponentContext  xInspectorContext(
 ::cppu::createComponentContext( aHandlerContextInfo, 
SAL_N_ELEMENTS( aHandlerContextInfo ), xOwnContext ) );
 
 // create a property browser controller
 Reference XMultiComponentFactory  xFactory( 
xInspectorContext-getServiceManager(), UNO_QUERY_THROW );
-static const ::rtl::OUString s_sControllerServiceName( 
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.awt.PropertyBrowserController ));
+static const OUString s_sControllerServiceName( 
com.sun.star.awt.PropertyBrowserController );
 m_xBrowserController = Reference XPropertySet (
 xFactory-createInstanceWithContext( s_sControllerServiceName, 
xInspectorContext ), UNO_QUERY
 );
@@ -294,7 +294,7 @@ void PropBrw::implSetNewObjectSequence
 {
 xObjectInspector-inspect( _rObjectSeq );
 
-::rtl::OUString aText = IDE_RESSTR(RID_STR_BRWTITLE_PROPERTIES);
+OUString aText = IDE_RESSTR(RID_STR_BRWTITLE_PROPERTIES);
 aText += IDE_RESSTR(RID_STR_BRWTITLE_MULTISELECT);
 SetText( aText );
 }
@@ -305,8 +305,7 @@ void PropBrw::implSetNewObject( const Reference 
XPropertySet  _rxObject )
 {
 if ( m_xBrowserController.is() )
 {
-m_xBrowserController-setPropertyValue(
-::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IntrospectedObject 
)),
+m_xBrowserController-setPropertyValue( IntrospectedObject,
 makeAny( _rxObject )
 );
 
@@ -316,9 +315,9 @@ void PropBrw::implSetNewObject( const Reference 
XPropertySet  _rxObject )
 }
 
 
-::rtl::OUString PropBrw::GetHeadlineName( const Reference XPropertySet  
_rxObject )
+OUString PropBrw::GetHeadlineName( const Reference XPropertySet  _rxObject )
 {
-::rtl::OUString aName;
+OUString aName;
 Reference lang::XServiceInfo  xServiceInfo( _rxObject, UNO_QUERY );
 
 if (xServiceInfo.is())// single selection
@@ -326,87 +325,87 @@ void PropBrw::implSetNewObject( const Reference 
XPropertySet  _rxObject )
 sal_uInt16 nResId = 0;
 aName = IDE_RESSTR(RID_STR_BRWTITLE_PROPERTIES);
 
-if ( xServiceInfo-supportsService( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.awt.UnoControlDialogModel ) ) ) )
+if ( xServiceInfo-supportsService( 
com.sun.star.awt.UnoControlDialogModel ) )
 {
 nResId = RID_STR_CLASS_DIALOG;
 }
-else if ( xServiceInfo-supportsService( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.awt.UnoControlButtonModel ) ) ) )
+else if ( xServiceInfo-supportsService( 
com.sun.star.awt.UnoControlButtonModel ) )
 {
 nResId = RID_STR_CLASS_BUTTON;
 }
-else if ( xServiceInfo-supportsService( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM(

[Libreoffice-commits] .: basctl/source

2012-10-26 Thread Libreoffice Gerrit user

 basctl/source/dlged/dlgedobj.cxx   |   53 ++---
 basctl/source/dlged/managelang.cxx |   16 +--
 2 files changed, 34 insertions(+), 35 deletions(-)

New commits:
commit a4b822e5e33a2bffdff66af483d838a201aea016
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Mon Oct 22 22:11:23 2012 -0200

::rtl::OUString - OUString in basctl

Change-Id: Ief0083c0274c573fce62c32dfae35a647804b20e
Reviewed-on: https://gerrit.libreoffice.org/900
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz

diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index fa93236..ba07117 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -49,7 +49,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::script;
-using ::rtl::OUString;
 
 TYPEINIT1(DlgEdObj, SdrUnoObj);
 DBG_NAME(DlgEdObj);
@@ -74,7 +73,7 @@ DlgEdObj::DlgEdObj()
 
 //
 
-DlgEdObj::DlgEdObj(const ::rtl::OUString rModelName,
+DlgEdObj::DlgEdObj(const OUString rModelName,
const com::sun::star::uno::Reference 
com::sun::star::lang::XMultiServiceFactory  rxSFac)
   :SdrUnoObj(rModelName, rxSFac, false)
   ,bIsListening(false)
@@ -488,11 +487,11 @@ void DlgEdObj::PositionAndSizeChange( const 
beans::PropertyChangeEvent evt )
 void SAL_CALL DlgEdObj::NameChange( const  
::com::sun::star::beans::PropertyChangeEvent evt ) throw( 
::com::sun::star::uno::RuntimeException)
 {
 // get old name
-::rtl::OUString aOldName;
+OUString aOldName;
 evt.OldValue = aOldName;
 
 // get new name
-::rtl::OUString aNewName;
+OUString aNewName;
 evt.NewValue = aNewName;
 
 if ( !aNewName.equals(aOldName) )
@@ -553,7 +552,7 @@ void DlgEdObj::UpdateStep()
 sal_Int32 nStep = GetStep();
 
 SdrLayerAdmin rLayerAdmin = GetModel()-GetLayerAdmin();
-SdrLayerID nHiddenLayerId   = rLayerAdmin.GetLayerID( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( HiddenLayer ) ), false );
+SdrLayerID nHiddenLayerId   = rLayerAdmin.GetLayerID( OUString( 
HiddenLayer ), false );
 SdrLayerID nControlLayerId   = rLayerAdmin.GetLayerID( 
rLayerAdmin.GetControlLayerName(), false );
 
 if( nCurStep )
@@ -592,8 +591,8 @@ void DlgEdObj::TabIndexChange( const 
beans::PropertyChangeEvent evt ) throw (Ru
 if ( xNameAcc.is() )
 {
 // get sequence of control names
-Sequence ::rtl::OUString  aNames = xNameAcc-getElementNames();
-const ::rtl::OUString* pNames = aNames.getConstArray();
+Sequence OUString  aNames = xNameAcc-getElementNames();
+const OUString* pNames = aNames.getConstArray();
 sal_Int32 nCtrls = aNames.getLength();
 sal_Int16 i;
 
@@ -602,7 +601,7 @@ void DlgEdObj::TabIndexChange( const 
beans::PropertyChangeEvent evt ) throw (Ru
 for ( i = 0; i  nCtrls; ++i )
 {
 // get control name
-::rtl::OUString aName( pNames[i] );
+OUString aName( pNames[i] );
 
 // get tab index
 sal_Int16 nTabIndex = -1;
@@ -619,7 +618,7 @@ void DlgEdObj::TabIndexChange( const 
beans::PropertyChangeEvent evt ) throw (Ru
 }
 
 // create a helper list of control names, sorted by tab index
-::std::vector ::rtl::OUString  aNameList( aIndexToNameMap.size() 
);
+::std::vector OUString  aNameList( aIndexToNameMap.size() );
 ::std::transform(
 aIndexToNameMap.begin(), aIndexToNameMap.end(),
 aNameList.begin(),
@@ -637,7 +636,7 @@ void DlgEdObj::TabIndexChange( const 
beans::PropertyChangeEvent evt ) throw (Ru
 nNewTabIndex = sal::static_int_castsal_Int16( nCtrls - 1 );
 
 // reorder helper list
-::rtl::OUString aCtrlName = aNameList[nOldTabIndex];
+OUString aCtrlName = aNameList[nOldTabIndex];
 aNameList.erase( aNameList.begin() + nOldTabIndex );
 aNameList.insert( aNameList.begin() + nNewTabIndex , aCtrlName );
 
@@ -679,17 +678,17 @@ sal_Bool DlgEdObj::supportsService( const sal_Char* 
_pServiceName ) const
 Reference lang::XServiceInfo  xServiceInfo( GetUnoControlModel() , 
UNO_QUERY );
 // TODO: cache xServiceInfo as member?
 if ( xServiceInfo.is() )
-bSupports = xServiceInfo-supportsService( 
::rtl::OUString::createFromAscii( _pServiceName ) );
+bSupports = xServiceInfo-supportsService( OUString::createFromAscii( 
_pServiceName ) );
 
 return bSupports;
 }
 
 //
 
-::rtl::OUString DlgEdObj::GetDefaultName() const
+OUString

[Libreoffice-commits] .: basctl/source comphelper/source framework/inc framework/source scripting/source sfx2/source sw/source xmlhelp/source xmloff/source

2012-10-23 Thread Libreoffice Gerrit user

 basctl/source/basicide/scriptdocument.cxx  |   15 +---
 comphelper/source/misc/mediadescriptor.cxx |9 +-
 framework/inc/dispatch/popupmenudispatcher.hxx |4 -
 framework/source/dispatch/popupmenudispatcher.cxx  |   75 +
 scripting/source/basprov/basprov.cxx   |   65 ++
 scripting/source/dlgprov/dlgprov.cxx   |   21 -
 scripting/source/protocolhandler/scripthandler.cxx |   19 +
 scripting/source/provider/MasterScriptProvider.cxx |   14 ---
 scripting/source/provider/URIHelper.cxx|7 -
 sfx2/source/appl/app.cxx   |   36 --
 sfx2/source/doc/DocumentMetadataAccess.cxx |   11 ---
 sfx2/source/view/viewfrm.cxx   |   45 +---
 sw/source/core/fields/macrofld.cxx |   23 ++
 sw/source/ui/fldui/fldmgr.cxx  |   22 ++
 xmlhelp/source/cxxhelp/provider/databases.cxx  |   17 
 xmlhelp/source/treeview/tvread.cxx |   14 ---
 xmloff/source/core/RDFaExportHelper.cxx|   10 --
 xmloff/source/transform/EventOASISTContext.cxx |   62 +++--
 18 files changed, 198 insertions(+), 271 deletions(-)

New commits:
commit 5aa2cd1d3f85958917f47523ee430af11ac1751d
Author: Noel Grandin n...@peralex.com
Date:   Fri Oct 12 08:57:24 2012 +0200

fdo#46808, use service constructor for uri::UriReferenceFactory

Change-Id: I4e72bf5880fa28cb96d93ede7730a63220af7fa6

diff --git a/basctl/source/basicide/scriptdocument.cxx 
b/basctl/source/basicide/scriptdocument.cxx
index 0e1fa08..3826f5a 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -25,7 +25,7 @@
 #include doceventnotifier.hxx
 #include documentenumeration.hxx
 
-#include com/sun/star/uri/XUriReferenceFactory.hpp
+#include com/sun/star/uri/UriReferenceFactory.hpp
 #include com/sun/star/util/XMacroExpander.hpp
 #include com/sun/star/document/MacroExecMode.hpp
 #include com/sun/star/frame/XStorable.hpp
@@ -88,6 +88,7 @@ namespace basctl
 using ::com::sun::star::uno::makeAny;
 using ::com::sun::star::script::XLibraryContainer2;
 using ::com::sun::star::lang::XMultiServiceFactory;
+using ::com::sun::star::uri::UriReferenceFactory;
 using ::com::sun::star::uri::XUriReferenceFactory;
 using ::com::sun::star::uri::XUriReference;
 using ::com::sun::star::uno::XComponentContext;
@@ -934,14 +935,8 @@ namespace basctl
 if ( !xLibContainer-hasByName( _rLibName ) || 
!xLibContainer-isLibraryLink( _rLibName ) )
 return false;
 OUString aFileURL;
-Reference XMultiServiceFactory  xMSF( 
::comphelper::getProcessServiceFactory() );
-Reference XUriReferenceFactory  xUriFac;
-if ( xMSF.is() )
-{
-xUriFac.set(
-xMSF-createInstance( 
com.sun.star.uri.UriReferenceFactory ),
-UNO_QUERY_THROW );
-}
+Reference XComponentContext  xContext( 
::comphelper::getProcessComponentContext() );
+Reference XUriReferenceFactory  xUriFac = 
UriReferenceFactory::create(xContext);
 
 OUString aLinkURL( xLibContainer-getLibraryLinkURL( _rLibName ) );
 Reference XUriReference  xUriRef( xUriFac-parse( aLinkURL ), 
UNO_QUERY_THROW );
@@ -958,8 +953,6 @@ namespace basctl
 {
 OUString aDecodedURL( aAuthority.copy( sizeof ( 
vnd.sun.star.expand: ) - 1 ) );
 aDecodedURL = ::rtl::Uri::decode( aDecodedURL, 
rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
-Reference XComponentContext  xContext(
-comphelper::getComponentContext( xMSF ) );
 Reference XMacroExpander  xMacroExpander(
 xContext-getValueByName(
 /singletons/com.sun.star.util.theMacroExpander ),
diff --git a/comphelper/source/misc/mediadescriptor.cxx 
b/comphelper/source/misc/mediadescriptor.cxx
index dd91d9e..84d3331 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -34,7 +34,7 @@
 #include com/sun/star/ucb/UnsupportedDataSinkException.hpp
 #include com/sun/star/ucb/CommandFailedException.hpp
 #include com/sun/star/task/XInteractionAbort.hpp
-#include com/sun/star/uri/XUriReferenceFactory.hpp
+#include com/sun/star/uri/UriReferenceFactory.hpp
 #include com/sun/star/uri/XUriReference.hpp
 #include com/sun/star/ucb/PostCommandArgument2.hpp
 #include com/sun/star/container/XNameAccess.hpp
@@ -705,13 +705,12 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const 
::rtl::OUString sURL, s
it parses the URL in another way. It's main part isnt enough
and it's complete part contains the jumpmark (fragment) parameter ...
 */
-static ::rtl::OUString

[Libreoffice-commits] .: basctl/source desktop/source offapi/com offapi/UnoApi_offapi.mk package/source sot/source

2012-10-23 Thread Libreoffice Gerrit user

 basctl/source/basicide/moduldl2.cxx   |8 -
 desktop/source/deployment/registry/package/dp_package.cxx |8 -
 offapi/UnoApi_offapi.mk   |1 
 offapi/com/sun/star/packages/manifest/ManifestWriter.idl  |   33 +++
 package/source/zippackage/ZipPackage.cxx  |   65 +-
 sot/source/sdstor/ucbstorage.cxx  |7 -
 6 files changed, 69 insertions(+), 53 deletions(-)

New commits:
commit 8aa5946afeac9d86f84239bd7ef101493059c3f5
Author: Noel Grandin n...@peralex.com
Date:   Mon Oct 15 09:59:33 2012 +0200

fdo#46808, Adapt packages::manifest::ManifestWriter UNO service to new style

The service already existed, it just did not have an IDL file

Change-Id: I04c617a97262e9cc96af17fcae9cc084245c0149

diff --git a/basctl/source/basicide/moduldl2.cxx 
b/basctl/source/basicide/moduldl2.cxx
index baef479..2d980fe 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -56,7 +56,7 @@
 #include com/sun/star/ucb/XSimpleFileAccess2.hpp
 #include com/sun/star/ucb/XCommandEnvironment.hpp
 #include com/sun/star/ucb/NameClash.hpp
-#include com/sun/star/packages/manifest/XManifestWriter.hpp
+#include com/sun/star/packages/manifest/ManifestWriter.hpp
 #include unotools/pathoptions.hxx
 #include comphelper/processfactory.hxx
 
@@ -1355,9 +1355,8 @@ void LibPage::ExportAsPackage( const String aLibName )
 manifest.push_back( attribs );
 
 // write into pipe:
-Referencepackages::manifest::XManifestWriter xManifestWriter( 
xMSF-createInstance
-( 
DEFINE_CONST_UNICODE(com.sun.star.packages.manifest.ManifestWriter) ), 
UNO_QUERY );
-Referenceio::XOutputStream xPipe( 
io::Pipe::create(comphelper::getComponentContext(xMSF)), UNO_QUERY_THROW );
+Referencepackages::manifest::XManifestWriter xManifestWriter = 
packages::manifest::ManifestWriter::create( xContext );
+Referenceio::XOutputStream xPipe( io::Pipe::create( xContext ), 
UNO_QUERY_THROW );
 xManifestWriter-writeManifestSequence(
 xPipe, Sequence Sequencebeans::PropertyValue (
 manifest[ 0 ], manifest.size() ) );
@@ -1384,7 +1383,6 @@ void LibPage::ExportAsPackage( const String aLibName )
 void LibPage::ExportAsBasic( const String aLibName )
 {
 // Folder picker
-Reference lang::XMultiServiceFactory  xMSF( 
::comphelper::getProcessServiceFactory() );
 Reference uno::XComponentContext  xContext( 
::comphelper::getProcessComponentContext() );
 Reference XFolderPicker2  xFolderPicker = FolderPicker::create(xContext);
 Reference task::XInteractionHandler2  xHandler( 
task::InteractionHandler::createWithParent(xContext, 0) );
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx 
b/desktop/source/deployment/registry/package/dp_package.cxx
index 9430297..d41ed12 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -62,7 +62,7 @@
 #include com/sun/star/sdbc/XResultSet.hpp
 #include com/sun/star/sdbc/XRow.hpp
 #include com/sun/star/packages/manifest/ManifestReader.hpp
-#include com/sun/star/packages/manifest/XManifestWriter.hpp
+#include com/sun/star/packages/manifest/ManifestWriter.hpp
 #include com/sun/star/deployment/DependencyException.hpp
 #include com/sun/star/deployment/LicenseException.hpp
 #include com/sun/star/deployment/PlatformException.hpp
@@ -1185,10 +1185,8 @@ void BackendImpl::PackageImpl::exportTo(
 // write into pipe:
 ReferenceXComponentContext xContext(
 getMyBackend()-getComponentContext() );
-Referencepackages::manifest::XManifestWriter xManifestWriter(
-xContext-getServiceManager()-createInstanceWithContext(
-OUSTR(com.sun.star.packages.manifest.ManifestWriter),
-xContext ), UNO_QUERY_THROW );
+Referencepackages::manifest::XManifestWriter xManifestWriter =
+packages::manifest::ManifestWriter::create( xContext );
 Referenceio::XOutputStream xPipe( io::Pipe::create(xContext), 
UNO_QUERY_THROW );
 xManifestWriter-writeManifestSequence(
 xPipe, comphelper::containerToSequence(manifest) );
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 18ad252..7b99858 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -179,6 +179,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mozilla,\
 ))
 $(eval $(call 
gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/packages/manifest,\
ManifestReader \
+   ManifestWriter \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/plugin,\
PluginManager \
diff --git a/offapi/com/sun/star/packages/manifest/ManifestWriter.idl 
b/offapi/com/sun/star/packages/manifest/ManifestWriter.idl
new file mode 100644
index 000..d61e652
---

[Libreoffice-commits] .: basctl/source

2012-10-22 Thread Libreoffice Gerrit user

 basctl/source/basicide/baside2b.cxx |2 -
 basctl/source/basicide/basides2.cxx |2 -
 basctl/source/basicide/tbxctl.cxx   |6 ++--
 basctl/source/basicide/unomodel.cxx |1 
 basctl/source/dlged/dlged.cxx   |   52 +---
 5 files changed, 30 insertions(+), 33 deletions(-)

New commits:
commit 41145f51c9efa81e55db9a6e928d422c252ccc4c
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Fri Oct 19 22:51:36 2012 -0300

OUString cleanup in basctl

Change-Id: I9644427f6d3bb4b2f488325eb520b365115a8e82
Reviewed-on: https://gerrit.libreoffice.org/892
Reviewed-by: Ivan Timofeev timofeev@gmail.com
Tested-by: Ivan Timofeev timofeev@gmail.com

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index b7b644f..2986b82 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -106,7 +106,7 @@ OUString getTextEngineText (ExtTextEngine rEngine)
 void setTextEngineText (ExtTextEngine rEngine, OUString const aStr)
 {
 rEngine.SetText(String());
-OString aUTF8Str = ::rtl::OUStringToOString( aStr, RTL_TEXTENCODING_UTF8 );
+OString aUTF8Str = OUStringToOString( aStr, RTL_TEXTENCODING_UTF8 );
 SvMemoryStream aMemStream( (void*)aUTF8Str.getStr(), aUTF8Str.getLength(),
 STREAM_READ | STREAM_SEEK_TO_BEGIN );
 aMemStream.SetStreamCharSet( RTL_TEXTENCODING_UTF8 );
diff --git a/basctl/source/basicide/basides2.cxx 
b/basctl/source/basicide/basides2.cxx
index 410d3a7..fe91e70 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -108,7 +108,7 @@ sal_uInt16 Shell::SetPrinter( SfxPrinter *pNewPrinter, 
sal_uInt16 nDiffFlags, bo
 
 void Shell::SetMDITitle()
 {
-::rtl::OUStringBuffer aTitleBuf;
+OUStringBuffer aTitleBuf;
 if ( !m_aCurLibName.isEmpty() )
 {
 LibraryLocation eLocation = m_aCurDocument.getLibraryLocation( 
m_aCurLibName );
diff --git a/basctl/source/basicide/tbxctl.cxx 
b/basctl/source/basicide/tbxctl.cxx
index 11d8068..1396e22 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::uno;
 
 namespace
 {
-rtl::OUString aSubToolBarResName( RTL_CONSTASCII_USTRINGPARAM( 
private:resource/toolbar/insertcontrolsbar ) );
+OUString aSubToolBarResName( private:resource/toolbar/insertcontrolsbar 
);
 }
 
 SFX_IMPL_TOOLBOX_CONTROL( TbxControls, SfxAllEnumItem )
@@ -107,8 +107,8 @@ void TbxControls::StateChanged( sal_uInt16 nSID, 
SfxItemState eState,
 }
 if( nTemp )
 {
-rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( slot: 
));
-aSlotURL += rtl::OUString::valueOf( sal_Int32( nTemp ));
+OUString aSlotURL( slot: );
+aSlotURL += OUString::valueOf( sal_Int32( nTemp ));
 Image aImage = GetImage( m_xFrame,
  aSlotURL,
  hasBigImages()
diff --git a/basctl/source/basicide/unomodel.cxx 
b/basctl/source/basicide/unomodel.cxx
index 6825aa2..0ee8f3a 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.cxx
@@ -31,7 +31,6 @@
 namespace basctl
 {
 
-using ::rtl::OUString;
 using namespace ::cppu;
 using namespace ::std;
 using namespace ::com::sun::star;
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index d4b8c5f..d56814f 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -53,11 +53,10 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::io;
-using ::rtl::OUString;
 
-static ::rtl::OUString aResourceResolverPropName( RTL_CONSTASCII_USTRINGPARAM( 
ResourceResolver ));
-static ::rtl::OUString aDecorationPropName( RTL_CONSTASCII_USTRINGPARAM( 
Decoration ));
-static ::rtl::OUString aTitlePropName( RTL_CONSTASCII_USTRINGPARAM( Title ));
+static OUString aResourceResolverPropName( ResourceResolver );
+static OUString aDecorationPropName( Decoration );
+static OUString aTitlePropName( Title );
 
 
 //
@@ -90,7 +89,7 @@ void DlgEditor::ShowDialog()
 uno::Reference lang::XMultiServiceFactory   xMSF = 
getProcessServiceFactory();
 
 // create a dialog
-uno::Reference awt::XControl  xDlg( xMSF-createInstance( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( 
com.sun.star.awt.UnoControlDialog ) ) ), uno::UNO_QUERY );
+uno::Reference awt::XControl  xDlg( xMSF-createInstance( 
com.sun.star.awt.UnoControlDialog ), uno::UNO_QUERY );
 
 // clone the dialog model
 uno::Reference util::XCloneable  xC( m_xUnoControlDialogModel, 
uno::UNO_QUERY );
@@ -123,7 +122,7 @@ void DlgEditor::ShowDialog()
 if( !bDecoration )
 {

[Libreoffice-commits] .: basctl/source

2012-10-22 Thread Libreoffice Gerrit user

 basctl/source/dlged/dlgedclip.cxx |6 +--
 basctl/source/dlged/dlgedfac.cxx  |   62 +++---
 2 files changed, 34 insertions(+), 34 deletions(-)

New commits:
commit 0397c4b02d894259cd86280185f52ec84a67b16a
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Mon Oct 22 17:20:26 2012 -0200

Some ::rtl::OUString to OUString in basctl

Change-Id: Ifbc60c2e6f2906cc0b7a3ea3fb9dfa1a8421d6a2
Reviewed-on: https://gerrit.libreoffice.org/896
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/basctl/source/dlged/dlgedclip.cxx 
b/basctl/source/dlged/dlgedclip.cxx
index 5473516..54cd68b 100644
--- a/basctl/source/dlged/dlgedclip.cxx
+++ b/basctl/source/dlged/dlgedclip.cxx
@@ -58,7 +58,7 @@ sal_Bool DlgEdTransferableImpl::compareDataFlavors( const 
DataFlavor lFlavor, c
 // compare mime content types
 Reference lang::XMultiServiceFactory   xMSF = getProcessServiceFactory();
 Reference datatransfer::XMimeContentTypeFactory 
-xMCntTypeFactory( xMSF-createInstance( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( 
com.sun.star.datatransfer.MimeContentTypeFactory ) ) ), UNO_QUERY );
+xMCntTypeFactory( xMSF-createInstance( 
com.sun.star.datatransfer.MimeContentTypeFactory ), UNO_QUERY );
 
 if ( xMCntTypeFactory.is( ) )
 {
@@ -66,8 +66,8 @@ sal_Bool DlgEdTransferableImpl::compareDataFlavors( const 
DataFlavor lFlavor, c
 Reference datatransfer::XMimeContentType  xLType = 
xMCntTypeFactory-createMimeContentType( lFlavor.MimeType );
 Reference datatransfer::XMimeContentType  xRType = 
xMCntTypeFactory-createMimeContentType( rFlavor.MimeType );
 
-::rtl::OUString aLFullMediaType = xLType-getFullMediaType();
-::rtl::OUString aRFullMediaType = xRType-getFullMediaType();
+OUString aLFullMediaType = xLType-getFullMediaType();
+OUString aRFullMediaType = xRType-getFullMediaType();
 
 bRet = aLFullMediaType.equalsIgnoreAsciiCase( aRFullMediaType );
 }
diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx
index 781d96b..9c117eb 100644
--- a/basctl/source/dlged/dlgedfac.cxx
+++ b/basctl/source/dlged/dlgedfac.cxx
@@ -51,7 +51,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, 
pObjFactory )
 if( bNeedsInit )
 {
 uno::Reference lang::XMultiServiceFactory  xMSF = 
::comphelper::getProcessServiceFactory();
-uno::Reference container::XNameContainer  xC( xMSF-createInstance( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( 
com.sun.star.awt.UnoControlDialogModel ) ) ), uno::UNO_QUERY );
+uno::Reference container::XNameContainer  xC( xMSF-createInstance( 
com.sun.star.awt.UnoControlDialogModel ), uno::UNO_QUERY );
 if( xC.is() )
 {
 uno::Reference lang::XMultiServiceFactory  xModFact( xC, 
uno::UNO_QUERY );
@@ -67,33 +67,33 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, 
pObjFactory )
 switch( pObjFactory-nIdentifier )
 {
 case OBJ_DLG_PUSHBUTTON:
- pObjFactory-pNewObj = new DlgEdObj( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.awt.UnoControlButtonModel )) , 
xDialogSFact );
+ pObjFactory-pNewObj = new DlgEdObj( 
com.sun.star.awt.UnoControlButtonModel, xDialogSFact );
   break;
 case OBJ_DLG_FORMRADIO:
 case OBJ_DLG_RADIOBUTTON:
  if ( pObjFactory-nIdentifier == OBJ_DLG_RADIOBUTTON )
- pObjFactory-pNewObj = new DlgEdObj( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.awt.UnoControlRadioButtonModel )) , 
xDialogSFact );
+ pObjFactory-pNewObj = new DlgEdObj( 
com.sun.star.awt.UnoControlRadioButtonModel, xDialogSFact );
  else
  {
- pObjFactory-pNewObj = new DlgEdObj( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.form.component.RadioButton )) , 
xDialogSFact );
+ pObjFactory-pNewObj = new DlgEdObj( 
com.sun.star.form.component.RadioButton, xDialogSFact );
  static_cast DlgEdObj* ( pObjFactory-pNewObj 
)-MakeDataAware( mxModel );
  }
  break;
 case OBJ_DLG_FORMCHECK:
 case OBJ_DLG_CHECKBOX:
  if ( pObjFactory-nIdentifier == OBJ_DLG_CHECKBOX )
- pObjFactory-pNewObj = new DlgEdObj( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.awt.UnoControlCheckBoxModel )) , 
xDialogSFact );
+ pObjFactory-pNewObj = new DlgEdObj( 
com.sun.star.awt.UnoControlCheckBoxModel, xDialogSFact );
  else
- pObjFactory-pNewObj = new DlgEdObj( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.form.component.CheckBox )) , 
xDialogSFact );
+ pObjFactory-pNewObj = new DlgEdObj(

[Libreoffice-commits] .: basctl/source cui/source dbaccess/source reportdesign/source sc/source sd/source svtools/inc svtools/source sw/source

2012-10-18 Thread Libreoffice Gerrit user

 basctl/source/basicide/baside2b.cxx   |2 
 cui/source/options/dbregister.cxx |2 
 cui/source/options/optlingu.cxx   |6 -
 cui/source/options/treeopt.cxx|2 
 cui/source/options/webconninfo.cxx|2 
 dbaccess/source/ui/app/AppDetailPageHelper.cxx|4 
 dbaccess/source/ui/browser/dbtreeview.cxx |2 
 dbaccess/source/ui/browser/dbtreeview.hxx |4 
 dbaccess/source/ui/browser/unodatbr.cxx   |4 
 dbaccess/source/ui/control/dbtreelistbox.cxx  |2 
 dbaccess/source/ui/dlg/indexdialog.cxx|2 
 dbaccess/source/ui/inc/unodatbr.hxx   |4 
 dbaccess/source/ui/querydesign/TableWindowListBox.cxx |2 
 reportdesign/source/ui/dlg/AddField.cxx   |2 
 sc/source/ui/miscdlgs/solveroptions.cxx   |4 
 sc/source/ui/optdlg/calcoptionsdlg.cxx|6 -
 sd/source/ui/dlg/dlgassim.cxx |4 
 svtools/inc/svtools/treelistbox.hxx   |   24 -
 svtools/source/contnr/svimpbox.cxx|2 
 svtools/source/contnr/treelistbox.cxx |   75 +-
 svtools/source/inc/svimpbox.hxx   |8 -
 sw/source/ui/misc/redlndlg.cxx|2 
 sw/source/ui/utlui/glbltree.cxx   |2 
 23 files changed, 42 insertions(+), 125 deletions(-)

New commits:
commit 49e5e750b51ae8b6ff5f8f98beedea1b4737c2fc
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Fri Oct 19 15:20:10 2012 +0200

Merge SvLBoxTreeList and SvTreeList.

Change-Id: I318ff6f1009b1aaa7d0bd3abb250f92fb51a21cd

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 134533c..b7b644f 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1957,7 +1957,7 @@ void implCollapseModifiedObjectEntry( SvTreeListEntry* 
pParent, WatchTreeListBox
 {
 pThis-Collapse( pParent );
 
-SvLBoxTreeList* pModel = pThis-GetModel();
+SvTreeList* pModel = pThis-GetModel();
 SvTreeListEntry* pDeleteEntry;
 while( (pDeleteEntry = pThis-SvTreeListBox::GetEntry( pParent, 0 )) != 
NULL )
 {
diff --git a/cui/source/options/dbregister.cxx 
b/cui/source/options/dbregister.cxx
index 590d0fb..d04d3c8 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -336,7 +336,7 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, 
HeaderBar*, pBar )
 nBits |= HIB_UPARROW;
 }
 pHeaderBar-SetItemBits( ITEMID_TYPE, nBits );
-SvLBoxTreeList* pModel = pPathBox-GetModel();
+SvTreeList* pModel = pPathBox-GetModel();
 pModel-SetSortMode( eMode );
 pModel-Resort();
 return 1;
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index f732a6a..f6b65f3 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1465,7 +1465,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet rSet )
 aLinguOptionsCLB.SetUpdateMode(sal_False);
 aLinguOptionsCLB.Clear();
 
-SvLBoxTreeList *pModel = aLinguOptionsCLB.GetModel();
+SvTreeList *pModel = aLinguOptionsCLB.GetModel();
 SvTreeListEntry* pEntry = NULL;
 
 sal_Int16 nVal = 0;
@@ -2113,7 +2113,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox 
*, pBox )
 static Locale aLastLocale;
 Locale aCurLocale;
 SvxLanguageToLocale(aCurLocale, eCurLanguage);
-SvLBoxTreeList *pModel = aModulesCLB.GetModel();
+SvTreeList *pModel = aModulesCLB.GetModel();
 
 if (pBox)
 {
@@ -2373,7 +2373,7 @@ IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton 
*, pBtn )
 0 != (pEntry = aModulesCLB.GetEntry(nCurPos)))
 {
 aModulesCLB.SetUpdateMode(sal_False);
-SvLBoxTreeList *pModel = aModulesCLB.GetModel();
+SvTreeList *pModel = aModulesCLB.GetModel();
 
 ModuleUserData_Impl* pData = 
(ModuleUserData_Impl*)pEntry-GetUserData();
 String aStr(aModulesCLB.GetEntryText(pEntry));
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 050d750..b0ed3a3 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1838,7 +1838,7 @@ void OfaTreeOptionsDialog::ResizeTreeLB( void )
 const long  nIndent0 = PixelToLogic( Size( 28, 0 ) ).Width();
 const long  nIndent1 = PixelToLogic( Size( 52, 0 ) ).Width();
 
-SvLBoxTreeList* pTreeList = aTreeLB.GetModel();
+SvTreeList* pTreeList = aTreeLB.GetModel();
 DBG_ASSERT( pTreeList, -OfaTreeOptionsDialog::ResizeTreeLB(): no model, 
no cookies! );
 
 SvTreeListEntry* pEntry = pTreeList-First();
diff --git a/cui/source/options/webconninfo.cxx 
b/cui/source/options/webconninfo.cxx
index b6f1bdc..a0a9e03 100644
--- a/cui/source/options/webconninfo.cxx
+++

[Libreoffice-commits] .: basctl/source

2012-10-16 Thread Libreoffice Gerrit user

 basctl/source/basicide/moduldlg.cxx |   72 ++--
 basctl/source/basicide/register.cxx |1 
 basctl/source/basicide/sbxitem.cxx  |   10 ++---
 3 files changed, 41 insertions(+), 42 deletions(-)

New commits:
commit 20e7a9bda9ae9eae2af47402903e17f95ae3510a
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Sun Oct 14 18:31:59 2012 -0300

rtl::OUString cleanup in basctl

Change-Id: If57c184b355224f31fdf7872ab1f52c034e5c7f0
Reviewed-on: https://gerrit.libreoffice.org/872
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br

diff --git a/basctl/source/basicide/moduldlg.cxx 
b/basctl/source/basicide/moduldlg.cxx
index 4a8cdb5..337063d 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -70,7 +70,7 @@ sal_Bool ExtTreeListBox::EditingEntry( SvLBoxEntry* pEntry, 
Selection )
 {
 EntryDescriptor aDesc = GetEntryDescriptor(pEntry);
 ScriptDocument aDocument( aDesc.GetDocument() );
-::rtl::OUString aLibName( aDesc.GetLibName() );
+OUString aLibName( aDesc.GetLibName() );
 Reference script::XLibraryContainer2  xModLibContainer( 
aDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
 Reference script::XLibraryContainer2  xDlgLibContainer( 
aDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY );
 if ( !( ( xModLibContainer.is()  xModLibContainer-hasByName( 
aLibName )  xModLibContainer-isLibraryReadOnly( aLibName ) ) ||
@@ -85,7 +85,7 @@ sal_Bool ExtTreeListBox::EditingEntry( SvLBoxEntry* pEntry, 
Selection )
 return bRet;
 }
 
-sal_Bool ExtTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const 
rtl::OUString rNewText )
+sal_Bool ExtTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const OUString 
rNewText )
 {
 if ( !IsValidSbxName(rNewText) )
 {
@@ -93,7 +93,7 @@ sal_Bool ExtTreeListBox::EditedEntry( SvLBoxEntry* pEntry, 
const rtl::OUString
 return false;
 }
 
-rtl::OUString aCurText( GetEntryText( pEntry ) );
+OUString aCurText( GetEntryText( pEntry ) );
 if ( aCurText == rNewText )
 // nothing to do
 return true;
@@ -103,7 +103,7 @@ sal_Bool ExtTreeListBox::EditedEntry( SvLBoxEntry* pEntry, 
const rtl::OUString
 DBG_ASSERT( aDocument.isValid(), ExtTreeListBox::EditedEntry: no 
document! );
 if ( !aDocument.isValid() )
 return false;
-::rtl::OUString aLibName( aDesc.GetLibName() );
+OUString aLibName( aDesc.GetLibName() );
 EntryType eType = aDesc.GetType();
 
 bool bSuccess = eType == OBJ_TYPE_MODULE ?
@@ -145,7 +145,7 @@ DragDropMode ExtTreeListBox::NotifyStartDrag( 
TransferDataContainer, SvLBoxEntr
 nMode_ = SV_DRAGDROP_CTRL_COPY;
 EntryDescriptor aDesc = GetEntryDescriptor(pEntry);
 ScriptDocument aDocument( aDesc.GetDocument() );
-::rtl::OUString aLibName( aDesc.GetLibName() );
+OUString aLibName( aDesc.GetLibName() );
 // allow MOVE mode only for libraries, which are not readonly
 Reference script::XLibraryContainer2  xModLibContainer( 
aDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
 Reference script::XLibraryContainer2  xDlgLibContainer( 
aDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY );
@@ -192,13 +192,13 @@ sal_Bool ExtTreeListBox::NotifyAcceptDrop( SvLBoxEntry* 
pEntry )
 {
 // get source module/dialog name
 EntryDescriptor aSourceDesc = GetEntryDescriptor(pSelected);
-rtl::OUString aSourceName = aSourceDesc.GetName();
+OUString aSourceName = aSourceDesc.GetName();
 EntryType eSourceType = aSourceDesc.GetType();
 
 // get target shell and target library name
 EntryDescriptor aDestDesc = GetEntryDescriptor(pEntry);
 ScriptDocument const rDestDoc = aDestDesc.GetDocument();
-rtl::OUString aDestLibName = aDestDesc.GetLibName();
+OUString aDestLibName = aDestDesc.GetLibName();
 
 // check if module library is not loaded, readonly or password 
protected
 Reference script::XLibraryContainer2  xModLibContainer( 
rDestDoc.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
@@ -255,10 +255,10 @@ sal_Bool ExtTreeListBox::NotifyCopying( SvLBoxEntry* 
pTarget, SvLBoxEntry* pEntr
 void Shell::CopyDialogResources(
 Reference io::XInputStreamProvider  io_xISP,
 ScriptDocument const rSourceDoc,
-rtl::OUString const rSourceLibName,
+OUString const rSourceLibName,
 ScriptDocument const rDestDoc,
-rtl::OUString const rDestLibName,
-rtl::OUString const rDlgName
+OUString const rDestLibName,
+OUString const rDlgName
 )
 {
 if ( !io_xISP.is() )
@@ -285,7 +285,7 @@ void Shell::CopyDialogResources(
 // create dialog model
 Reference lang::XMultiServiceFactory  xMSF = 
::comphelper::getProcessServiceFactory();
 Reference

[Libreoffice-commits] .: basctl/source

2012-10-16 Thread Libreoffice Gerrit user

 basctl/source/basicide/moduldlg.hxx   |   10 -
 basctl/source/basicide/scriptdocument.cxx |  176 ++
 2 files changed, 91 insertions(+), 95 deletions(-)

New commits:
commit e6b28a09f4bf9cfd30c1851d5ed9fb44c1423881
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Sun Oct 14 19:00:25 2012 -0300

More rtl::OUString cleanup in basctl

Change-Id: Ife2754b17e111c0e129670b95bd2e16d81ad906c
Reviewed-on: https://gerrit.libreoffice.org/873
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz

diff --git a/basctl/source/basicide/moduldlg.hxx 
b/basctl/source/basicide/moduldlg.hxx
index 71f6e66..1179a9c 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -105,7 +105,7 @@ class ExtTreeListBox : public TreeListBox
 {
 protected:
 virtual sal_BoolEditingEntry( SvLBoxEntry* pEntry, Selection rSel  );
-virtual sal_BoolEditedEntry( SvLBoxEntry* pEntry, const rtl::OUString 
rNewText );
+virtual sal_BoolEditedEntry( SvLBoxEntry* pEntry, const OUString 
rNewText );
 
 virtual DragDropModeNotifyStartDrag( TransferDataContainer rData, 
SvLBoxEntry* pEntry );
 virtual sal_BoolNotifyAcceptDrop( SvLBoxEntry* pEntry );
@@ -142,7 +142,7 @@ public:
 
 virtual voidInitEntry( SvLBoxEntry*, const XubString, const Image, 
const Image, SvLBoxButtonKind eButtonKind );
 virtual sal_BoolEditingEntry( SvLBoxEntry* pEntry, Selection rSel );
-virtual sal_BoolEditedEntry( SvLBoxEntry* pEntry, const rtl::OUString 
rNewText );
+virtual sal_BoolEditedEntry( SvLBoxEntry* pEntry, const OUString 
rNewText );
 
 voidSetDocument( const ScriptDocument rDocument ) { 
m_aDocument = rDocument; }
 
@@ -165,7 +165,7 @@ public:
 LibDialog( Window* pParent );
 ~LibDialog();
 
-voidSetStorageName( const ::rtl::OUString rName );
+voidSetStorageName( const OUString rName );
 
 CheckBox   GetLibBox() { return aLibBox; }
 boolIsReference() const { return 
aReferenceBox.IsChecked(); }
@@ -205,7 +205,7 @@ protected:
 DECL_LINK( BasicBoxHighlightHdl, TreeListBox * );
 DECL_LINK( ButtonHdl, Button * );
 voidCheckButtons();
-boolGetSelection( ScriptDocument rDocument, 
::rtl::OUString rLibName );
+boolGetSelection( ScriptDocument rDocument, OUString 
rLibName );
 voidDeleteCurrent();
 voidNewModule();
 voidNewDialog();
@@ -274,7 +274,7 @@ public:
 
 // Helper functions
 SbModule* createModImpl( Window* pWin, const ScriptDocument rDocument,
-TreeListBox rBasicBox, const ::rtl::OUString rLibName, ::rtl::OUString 
aModName, bool bMain = false );
+TreeListBox rBasicBox, const OUString rLibName, OUString aModName, bool 
bMain = false );
 void createLibImpl( Window* pWin, const ScriptDocument rDocument,
 CheckBox* pLibBox, TreeListBox* pBasicBox );
 
diff --git a/basctl/source/basicide/scriptdocument.cxx 
b/basctl/source/basicide/scriptdocument.cxx
index cdf91fb..d61de8f 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -231,7 +231,7 @@ namespace basctl
 getLibraryContainer( LibraryContainerType _eType ) const;
 
 /// determines whether a given library is part of the shared 
installation
-boolisLibraryShared( const ::rtl::OUString _rLibName, 
LibraryContainerType _eType );
+boolisLibraryShared( const OUString _rLibName, 
LibraryContainerType _eType );
 
 /** returns the current frame of the document
 
@@ -252,30 +252,28 @@ namespace basctl
 boolisDocumentModified() const;
 boolsaveDocument( const Reference XStatusIndicator  
_rxStatusIndicator ) const;
 
-::rtl::OUString
-getTitle() const;
-::rtl::OUString
-getURL() const;
+OUStringgetTitle() const;
+OUStringgetURL() const;
 
 boolallowMacros() const;
 
 Reference XNameContainer 
-getLibrary( LibraryContainerType _eType, const 
::rtl::OUString _rLibName, bool _bLoadLibrary ) const
+getLibrary( LibraryContainerType _eType, const OUString 
_rLibName, bool _bLoadLibrary ) const
 SAL_THROW((NoSuchElementException));
-boolhasLibrary( LibraryContainerType _eType, const 
::rtl::OUString _rLibName ) const;
+boolhasLibrary( LibraryContainerType _eType, const OUString 
_rLibName ) const;
 Reference XNameContainer 
-getOrCreateLibrary( LibraryContainerType _eType, const 
::rtl::OUString _rLibName ) const;
+getOrCreateLibrary(

[Libreoffice-commits] .: basctl/source

2012-10-15 Thread Libreoffice Gerrit user

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

New commits:
commit 5ad86ef1caaa029b8c95273528afeb724fa6582d
Author: Jan Holesovsky ke...@suse.cz
Date:   Mon Oct 15 11:00:28 2012 +0200

Use isEmpty().

Change-Id: I0b2a30384cbbe3f05d25968c4e7e19e84c23e267

diff --git a/basctl/source/basicide/basobj3.cxx 
b/basctl/source/basicide/basobj3.cxx
index 7850b95..f0aa0ba 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -84,7 +84,7 @@ SbMethod* CreateMacro( SbModule* pModule, const String 
rMacroName )
 return 0;
 
 OUString aMacroName( rMacroName );
-if ( aMacroName.getLength() == 0 )
+if ( aMacroName.isEmpty() )
 {
 if ( !pModule-GetMethods()-Count() )
 aMacroName = Main ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2012-10-13 Thread Libreoffice Gerrit user

 basctl/source/basicide/basobj3.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f50f9c43414403aca721612fdba9a9aa2dbdbf9b
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Tue Oct 9 17:30:01 2012 -0300

Review corrections in basctl/.../basobj3.cxx

Change-Id: I905e85ce9d754047ad287c9dd3caa92427b25b0d

diff --git a/basctl/source/basicide/basobj3.cxx 
b/basctl/source/basicide/basobj3.cxx
index 6a72666..8ab1add 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -83,20 +83,20 @@ SbMethod* CreateMacro( SbModule* pModule, const String 
rMacroName )
 if ( pModule-GetMethods()-Find( rMacroName, SbxCLASS_METHOD ) )
 return 0;
 
-String aMacroName( rMacroName );
-if ( aMacroName.Len() == 0 )
+OUString aMacroName( rMacroName );
+if ( aMacroName.getLength() == 0 )
 {
 if ( !pModule-GetMethods()-Count() )
-aMacroName = String( Main );
+aMacroName = Main ;
 else
 {
 bool bValid = false;
-String aStdMacroText( Macro );
+OUString aStdMacroText( Macro );
 sal_uInt16 nMacro = 1;
 while ( !bValid )
 {
 aMacroName = aStdMacroText;
-aMacroName += String::CreateFromInt32( nMacro );
+aMacroName += OUString::valueOf( nMacro );
 // test whether existing...
 bValid = pModule-GetMethods()-Find( aMacroName, 
SbxCLASS_METHOD ) ? false : true;
 nMacro++;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2012-10-12 Thread Libreoffice Gerrit user

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

New commits:
commit ceb06a8f0906dd9bd7aa69b121a050eb4dcc861e
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Wed Oct 10 12:06:14 2012 -0300

766 gerrit patch, fix appendAscii in bastype2.cxx

Change-Id: I4409d1b0585a8c52cba14d1e67ccf776c6070c8a
Reviewed-on: https://gerrit.libreoffice.org/854
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br

diff --git a/basctl/source/basicide/bastype2.cxx 
b/basctl/source/basicide/bastype2.cxx
index db20813..8ef1a92 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -480,7 +480,7 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( 
SvLBoxEntry* pLibSubRootEn
 ModuleInfoHelper::getObjectName( xLib, aModName, sObjName );
 if( !sObjName.isEmpty() )
 {
-aEntryNameBuf.appendAscii(  ( );
+aEntryNameBuf.append(  ( );
 aEntryNameBuf.append(sObjName);
 aEntryNameBuf.append(')');
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2012-10-04 Thread Libreoffice Gerrit user

 basctl/source/basicide/baside3.cxx |   90 -
 basctl/source/basicide/basidectrlr.cxx |2 
 basctl/source/basicide/basides1.cxx|   74 +--
 basctl/source/basicide/bastype2.hxx|   62 +++---
 4 files changed, 114 insertions(+), 114 deletions(-)

New commits:
commit 554a45f266791c32543fcf96a979036becf41f8a
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Tue Oct 2 11:31:09 2012 -0300

::rtl::OUString to OUString in basctl

Change-Id: I34228049e15ee8a899a4c5e1484d7ed3bc541dd4
Reviewed-on: https://gerrit.libreoffice.org/748
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br

diff --git a/basctl/source/basicide/baside3.cxx 
b/basctl/source/basicide/baside3.cxx
index e5fc1ce..27bdba1 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -77,7 +77,7 @@ TYPEINIT1( DialogWindow, BaseWindow );
 DialogWindow::DialogWindow (
 DialogWindowLayout* pParent,
 ScriptDocument const rDocument,
-rtl::OUString aLibName, rtl::OUString aName,
+OUString aLibName, OUString aName,
 com::sun::star::uno::Referencecom::sun::star::container::XNameContainer 
const xDialogModel
 ) :
 BaseWindow(pParent, rDocument, aLibName, aName),
@@ -256,7 +256,7 @@ void DialogWindow::GetState( SfxItemSet rSet )
 if ( xModel.is() )
 {
 Reference lang::XServiceInfo  xServiceInfo ( xModel, UNO_QUERY );
-if ( xServiceInfo.is()  xServiceInfo-supportsService( 
rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM(com.sun.star.sheet.SpreadsheetDocument) ) ) )
+if ( xServiceInfo.is()  xServiceInfo-supportsService( 
com.sun.star.sheet.SpreadsheetDocument ) )
 bIsCalc = true;
 }
 }
@@ -662,7 +662,7 @@ Reference container::XNameContainer  
DialogWindow::GetDialog() const
 return pEditor-GetDialog();
 }
 
-bool DialogWindow::RenameDialog( const ::rtl::OUString rNewName )
+bool DialogWindow::RenameDialog( const OUString rNewName )
 {
 if ( !basctl::RenameDialog( this, GetDocument(), GetLibName(), GetName(), 
rNewName ) )
 return false;
@@ -683,7 +683,7 @@ void DialogWindow::UpdateBrowser()
 rLayout.UpdatePropertyBrowser();
 }
 
-static ::rtl::OUString aResourceResolverPropName( RTL_CONSTASCII_USTRINGPARAM( 
ResourceResolver ));
+static OUString aResourceResolverPropName( ResourceResolver );
 
 bool DialogWindow::SaveDialog()
 {
@@ -697,7 +697,7 @@ bool DialogWindow::SaveDialog()
 Sequence Any aServiceType(1);
 aServiceType[0] = 
TemplateDescription::FILESAVE_AUTOEXTENSION_PASSWORD;
 xFP = Reference XFilePicker ( xMSF-createInstanceWithArguments(
-::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( 
com.sun.star.ui.dialogs.FilePicker ) ), aServiceType ), UNO_QUERY );
+com.sun.star.ui.dialogs.FilePicker, aServiceType ), UNO_QUERY );
 }
 
 Reference XFilePickerControlAccess  xFPControl(xFP, UNO_QUERY);
@@ -709,17 +709,17 @@ bool DialogWindow::SaveDialog()
 if ( !aCurPath.isEmpty() )
 xFP-setDisplayDirectory ( aCurPath );
 
-xFP-setDefaultName( ::rtl::OUString( GetName() ) );
+xFP-setDefaultName( OUString( GetName() ) );
 
-::rtl::OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME));
+OUString aDialogStr(IDE_RESSTR(RID_STR_STDDIALOGNAME));
 Reference XFilterManager  xFltMgr(xFP, UNO_QUERY);
-xFltMgr-appendFilter( aDialogStr, String( RTL_CONSTASCII_USTRINGPARAM( 
*.xdl ) ) );
-xFltMgr-appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), String( 
RTL_CONSTASCII_USTRINGPARAM( FilterMask_All ) ) );
+xFltMgr-appendFilter( aDialogStr, String( *.xdl ) );
+xFltMgr-appendFilter( IDE_RESSTR(RID_STR_FILTER_ALLFILES), String( 
FilterMask_All ) );
 xFltMgr-setCurrentFilter( aDialogStr );
 
 if( xFP-execute() == RET_OK )
 {
-Sequence ::rtl::OUString  aPaths = xFP-getFiles();
+Sequence OUString  aPaths = xFP-getFiles();
 aCurPath = aPaths[0];
 
 // export dialog model to xml
@@ -782,29 +782,29 @@ bool DialogWindow::SaveDialog()
 {
 INetURLObject aURLObj( aCurPath );
 aURLObj.removeExtension();
-::rtl::OUString aDialogName( aURLObj.getName() );
+OUString aDialogName( aURLObj.getName() );
 aURLObj.removeSegment();
-::rtl::OUString aURL( aURLObj.GetMainURL( 
INetURLObject::NO_DECODE ) );
+OUString aURL( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) 
);
 bool bReadOnly = false;
-::rtl::OUString aComment( RTL_CONSTASCII_USTRINGPARAM( #  ));
+OUString aComment( #  );
 aComment += aDialogName;
-aComment += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(  
strings ));
+aComment +=  strings ;

[Libreoffice-commits] .: basctl/source

2012-10-04 Thread Libreoffice Gerrit user

 basctl/source/basicide/basidesh.cxx |   41 +---
 basctl/source/basicide/basobj2.cxx  |   52 ++--
 2 files changed, 46 insertions(+), 47 deletions(-)

New commits:
commit b29ecc914b78216ea9a355c431ca4748eb056b06
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Thu Oct 4 00:32:16 2012 -0300

More ::rtl::OUString cleanup in basctl

Change-Id: If7cefe8d2e188e65a465a25a5d5f77e6daebcd17
Reviewed-on: https://gerrit.libreoffice.org/760
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br

diff --git a/basctl/source/basicide/basidesh.cxx 
b/basctl/source/basicide/basidesh.cxx
index 5b64d24..4639b4e 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -65,7 +65,6 @@ namespace basctl
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
-using ::rtl::OUString;
 
 typedef ::cppu::WeakImplHelper1 container::XContainerListener  
ContainerListenerBASE;
 
@@ -79,7 +78,7 @@ public:
 ~ContainerListenerImpl()
 { }
 
-void addContainerListener( const ScriptDocument rScriptDocument, const 
::rtl::OUString aLibName )
+void addContainerListener( const ScriptDocument rScriptDocument, const 
OUString aLibName )
 {
 try
 {
@@ -92,7 +91,7 @@ public:
 }
 catch(const uno::Exception ) {}
 }
-void removeContainerListener( const ScriptDocument rScriptDocument, const 
::rtl::OUString aLibName )
+void removeContainerListener( const ScriptDocument rScriptDocument, const 
OUString aLibName )
 {
 try
 {
@@ -112,14 +111,14 @@ public:
 // XContainerListener
 virtual void SAL_CALL elementInserted( const container::ContainerEvent 
Event ) throw( uno::RuntimeException )
 {
-rtl::OUString sModuleName;
+OUString sModuleName;
 if( mpShell  ( Event.Accessor = sModuleName ) )
 mpShell-FindBasWin( mpShell-m_aCurDocument, 
mpShell-m_aCurLibName, sModuleName, true, false );
 }
 virtual void SAL_CALL elementReplaced( const container::ContainerEvent ) 
throw( com::sun::star::uno::RuntimeException ) { }
 virtual void SAL_CALL elementRemoved( const container::ContainerEvent 
Event ) throw( com::sun::star::uno::RuntimeException )
 {
-rtl::OUString sModuleName;
+OUString sModuleName;
 if( mpShell   ( Event.Accessor = sModuleName ) )
 {
 ModulWindow* pWin = mpShell-FindBasWin(mpShell-m_aCurDocument, 
mpShell-m_aCurLibName, sModuleName, false, true);
@@ -186,7 +185,7 @@ void Shell::Init()
 
 GetExtraData()-ShellInCriticalSection() = true;
 
-SetName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( BasicIDE ) ) );
+SetName( OUString( BasicIDE ) );
 SetHelpId( SVX_INTERFACE_BASIDE_VIEWSH );
 
 LibBoxControl::RegisterControl( SID_BASICIDE_LIBSELECTOR );
@@ -208,7 +207,7 @@ void Shell::Init()
 InitScrollBars();
 InitTabBar();
 
-SetCurLib( ScriptDocument::getApplicationScriptDocument(), 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Standard)), false, false );
+SetCurLib( ScriptDocument::getApplicationScriptDocument(), Standard, 
false, false );
 
 ShellCreated(this);
 
@@ -330,7 +329,7 @@ void Shell::onDocumentClosed( const ScriptDocument 
_rDocument )
 pData-GetLibInfos().RemoveInfoFor( _rDocument );
 
 if ( bSetCurLib )
-SetCurLib( ScriptDocument::getApplicationScriptDocument(), 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Standard)), true, false );
+SetCurLib( ScriptDocument::getApplicationScriptDocument(), Standard, 
true, false );
 else if ( bSetCurWindow )
 SetCurWindow( FindApplicationWindow(), true );
 }
@@ -401,7 +400,7 @@ sal_uInt16 Shell::PrepareClose( sal_Bool bUI, sal_Bool 
bForBrowsing )
 if ( !pWin-CanClose() )
 {
 if ( !m_aCurLibName.isEmpty()  ( pWin-IsDocument( 
m_aCurDocument ) || pWin-GetLibName() != m_aCurLibName ) )
-SetCurLib( ScriptDocument::getApplicationScriptDocument(), 
::rtl::OUString(), false );
+SetCurLib( ScriptDocument::getApplicationScriptDocument(), 
OUString(), false );
 SetCurWindow( pWin, true );
 bCanClose = false;
 }
@@ -626,7 +625,7 @@ void Shell::CheckWindows()
 
 
 
-void Shell::RemoveWindows( const ScriptDocument rDocument, const 
::rtl::OUString rLibName, bool bDestroy )
+void Shell::RemoveWindows( const ScriptDocument rDocument, const OUString 
rLibName, bool bDestroy )
 {
 bool bChangeCurWindow = pCurWin ? false : true;
 std::vectorBaseWindow* aDeleteVec;
@@ -693,13 +692,13 @@ void Shell::UpdateWindows()
 StartListening( *doc-getBasicManager(), true /* log on only once */ );
 
 // libraries
-Sequence ::rtl::OUString  aLibNames( doc-getLibraryNames() );
+Sequence OUString  aLibNames(

[Libreoffice-commits] .: basctl/source

2012-10-03 Thread Libreoffice Gerrit user

 basctl/source/basicide/basicbox.cxx|4 +-
 basctl/source/basicide/basicrenderable.cxx |   36 +-
 basctl/source/basicide/baside2.cxx |   56 ++---
 basctl/source/basicide/baside2.hxx |   20 +-
 4 files changed, 58 insertions(+), 58 deletions(-)

New commits:
commit db1af9a43458bd7cc9995c3c4e901ddad4e79c8d
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Mon Oct 1 13:03:37 2012 -0300

OUString and RTL_CONSTASCII_US... cleanup in basctl

Change-Id: I440d245d013873ec2830280ad01a4d0625fc4c1a
Reviewed-on: https://gerrit.libreoffice.org/741
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br

diff --git a/basctl/source/basicide/basicbox.cxx 
b/basctl/source/basicide/basicbox.cxx
index 2cc65d1..5d278c2 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -237,9 +237,9 @@ void LibBox::FillBox()
 void LibBox::InsertEntries( const ScriptDocument rDocument, LibraryLocation 
eLocation )
 {
 // get a sorted list of library names
-Sequence ::rtl::OUString  aLibNames = rDocument.getLibraryNames();
+Sequence OUString  aLibNames = rDocument.getLibraryNames();
 sal_Int32 nLibCount = aLibNames.getLength();
-const ::rtl::OUString* pLibNames = aLibNames.getConstArray();
+const OUString* pLibNames = aLibNames.getConstArray();
 
 for ( sal_Int32 i = 0 ; i  nLibCount ; ++i )
 {
diff --git a/basctl/source/basicide/basicrenderable.cxx 
b/basctl/source/basicide/basicrenderable.cxx
index 9fe4ae7..5200c8c 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -46,31 +46,31 @@ Renderable::Renderable (BaseWindow* pWin)
 
 // show Subgroup for print range
 vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt;
-aPrintRangeOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
PrintRange ) );
+aPrintRangeOpt.maGroupHint = PrintRange ;
 aPrintRangeOpt.mbInternalOnly = true;
 m_aUIProperties[0].Value = setSubgroupControlOpt(printrange,
-rtl::OUString(aStrings.GetString(0)), rtl::OUString(), aPrintRangeOpt);
+OUString(aStrings.GetString(0)), OUString(), aPrintRangeOpt);
 
 // create a choice for the range to print
-rtl::OUString aPrintContentName( RTL_CONSTASCII_USTRINGPARAM( 
PrintContent ) );
-Sequence rtl::OUString  aChoices( 2 );
-Sequence rtl::OUString  aHelpIds( 2 );
-Sequence rtl::OUString  aWidgetIds( 2 );
+OUString aPrintContentName( PrintContent );
+Sequence OUString  aChoices( 2 );
+Sequence OUString  aHelpIds( 2 );
+Sequence OUString  aWidgetIds( 2 );
 aChoices[0] = aStrings.GetString( 1 );
-aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
.HelpID:vcl:PrintDialog:PrintContent:RadioButton:0 ) );
+aHelpIds[0] = .HelpID:vcl:PrintDialog:PrintContent:RadioButton:0 ;
 aChoices[1] = aStrings.GetString( 2 );
-aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
.HelpID:vcl:PrintDialog:PrintContent:RadioButton:1 ) );
-aWidgetIds[0] = rtl::OUString(printallpages);
-aWidgetIds[1] = rtl::OUString(printpages);
-m_aUIProperties[1].Value = setChoiceRadiosControlOpt(aWidgetIds, 
rtl::OUString(),
+aHelpIds[1] = .HelpID:vcl:PrintDialog:PrintContent:RadioButton:1 ;
+aWidgetIds[0] = printallpages ;
+aWidgetIds[1] = printpages ;
+m_aUIProperties[1].Value = setChoiceRadiosControlOpt(aWidgetIds, 
OUString(),
aHelpIds, aPrintContentName,
aChoices, 0);
 
 // create a an Edit dependent on Pages selected
 vcl::PrinterOptionsHelper::UIControlOptions 
aPageRangeOpt(aPrintContentName, 1, true);
-m_aUIProperties[2].Value = setEditControlOpt(pagerange, rtl::OUString(),
- rtl::OUString(), PageRange,
- rtl::OUString(), 
aPageRangeOpt);
+m_aUIProperties[2].Value = setEditControlOpt(pagerange, OUString(),
+ OUString(), PageRange,
+ OUString(), aPageRangeOpt);
 }
 
 Renderable::~Renderable()
@@ -80,7 +80,7 @@ Renderable::~Renderable()
 Printer* Renderable::getPrinter()
 {
 Printer* pPrinter = NULL;
-Any aValue( getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
RenderDevice ) ) ) );
+Any aValue( getValue( RenderDevice ) );
 Referenceawt::XDevice xRenderDevice;
 
 if( aValue = xRenderDevice )
@@ -107,7 +107,7 @@ sal_Int32 SAL_CALL Renderable::getRendererCount (
 sal_Int64 nContent = getIntValue( PrintContent, -1 );
 if( nContent == 1 )
 {
-rtl::OUString aPageRange( getStringValue( PageRange ) );
+OUString aPageRange( getStringValue(

[Libreoffice-commits] .: basctl/source

2012-09-28 Thread Libreoffice Gerrit user

 basctl/source/basicide/unomodel.cxx|8 
 basctl/source/basicide/unomodel.hxx|   10 +-
 basctl/source/inc/accessibledialogcontrolshape.hxx |   16 
 basctl/source/inc/baside3.hxx  |8 
 basctl/source/inc/dlgedobj.hxx |8 
 basctl/source/inc/iderid.hxx   |2 +-
 6 files changed, 26 insertions(+), 26 deletions(-)

New commits:
commit 6cb080ff913fce2d0477566420157733de997f52
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Thu Sep 27 13:22:42 2012 -0300

::rtl::OUString to OUString in basctl

Change-Id: I7be699102eab9cbf7184a5777a4b161db885adec
Reviewed-on: https://gerrit.libreoffice.org/711
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br

diff --git a/basctl/source/basicide/unomodel.cxx 
b/basctl/source/basicide/unomodel.cxx
index ef95956..6825aa2 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.cxx
@@ -87,14 +87,14 @@ OUString SIDEModel::getImplementationName(void) throw( 
uno::RuntimeException )
 return getImplementationName_Static();
 }
 
-::rtl::OUString SIDEModel::getImplementationName_Static()
+OUString SIDEModel::getImplementationName_Static()
 {
-return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
com.sun.star.comp.basic.BasicIDE ));
+return OUString( com.sun.star.comp.basic.BasicIDE );
 }
 
 sal_Bool SIDEModel::supportsService(const OUString rServiceName) throw( 
uno::RuntimeException )
 {
-return rServiceName == ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
com.sun.star.script.BasicIDE ));
+return rServiceName == OUString( com.sun.star.script.BasicIDE );
 }
 uno::Sequence OUString  SIDEModel::getSupportedServiceNames(void) throw( 
uno::RuntimeException )
 {
@@ -105,7 +105,7 @@ uno::Sequence OUString  
SIDEModel::getSupportedServiceNames_Static(void)
 {
 uno::Sequence OUString  aRet(1);
 OUString* pArray = aRet.getArray();
-pArray[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
com.sun.star.script.BasicIDE ));
+pArray[0] = com.sun.star.script.BasicIDE ;
 return aRet;
 }
 
diff --git a/basctl/source/basicide/unomodel.hxx 
b/basctl/source/basicide/unomodel.hxx
index 41ce8fe..87b230a 100644
--- a/basctl/source/basicide/unomodel.hxx
+++ b/basctl/source/basicide/unomodel.hxx
@@ -43,15 +43,15 @@ public:
 virtual ::com::sun::star::uno::Sequence ::com::sun::star::uno::Type  
SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
 
 //XServiceInfo
-virtual rtl::OUString SAL_CALL getImplementationName(void)
+virtual OUString SAL_CALL getImplementationName(void)
 throw( ::com::sun::star::uno::RuntimeException );
-virtual sal_Bool SAL_CALL supportsService(const rtl::OUString ServiceName)
+virtual sal_Bool SAL_CALL supportsService(const OUString ServiceName)
 throw( ::com::sun::star::uno::RuntimeException );
-virtual ::com::sun::star::uno::Sequence rtl::OUString  SAL_CALL 
getSupportedServiceNames(void)
+virtual ::com::sun::star::uno::Sequence OUString  SAL_CALL 
getSupportedServiceNames(void)
 throw( ::com::sun::star::uno::RuntimeException );
 
-static ::com::sun::star::uno::Sequence rtl::OUString  
getSupportedServiceNames_Static();
-static ::rtl::OUString getImplementationName_Static();
+static ::com::sun::star::uno::Sequence OUString  
getSupportedServiceNames_Static();
+static OUString getImplementationName_Static();
 };
 
 com::sun::star::uno::Reference com::sun::star::uno::XInterface  SAL_CALL 
SIDEModel_createInstance(
diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx 
b/basctl/source/inc/accessibledialogcontrolshape.hxx
index 6068318..46761c1 100644
--- a/basctl/source/inc/accessibledialogcontrolshape.hxx
+++ b/basctl/source/inc/accessibledialogcontrolshape.hxx
@@ -76,7 +76,7 @@ protected:
 
 Window* GetWindow() const;
 
-::rtl::OUString GetModelStringProperty( const sal_Char* 
pPropertyName );
+OUStringGetModelStringProperty( const sal_Char* 
pPropertyName );
 
 virtual voidFillAccessibleStateSet( 
utl::AccessibleStateSetHelper rStateSet );
 
@@ -103,9 +103,9 @@ public:
 virtual void SAL_CALL propertyChange( const 
::com::sun::star::beans::PropertyChangeEvent rEvent ) throw 
(::com::sun::star::uno::RuntimeException);
 
 // XServiceInfo
-virtual ::rtl::OUString SAL_CALL getImplementationName() throw 
(::com::sun::star::uno::RuntimeException);
-virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString 
rServiceName ) throw (::com::sun::star::uno::RuntimeException);
-virtual ::com::sun::star::uno::Sequence ::rtl::OUString  SAL_CALL 
getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+virtual OUString SAL_CALL getImplementationName() throw

[Libreoffice-commits] .: basctl/source

2012-09-27 Thread Libreoffice Gerrit user

 basctl/source/basicide/baside2b.cxx |   58 ++--
 1 file changed, 29 insertions(+), 29 deletions(-)

New commits:
commit f25adb4954eaea92e1d98a652a66eeaa4c8fe7c3
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Wed Sep 26 23:07:35 2012 -0300

String to OUString in basctl

Change-Id: I52ce4fcf4b02746df898c7fbbf57a58b274dd0b2
Reviewed-on: https://gerrit.libreoffice.org/706
Tested-by: Noel Power noel.po...@suse.com
Reviewed-by: Noel Power noel.po...@suse.com

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index fefed79..914a916 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -91,22 +91,22 @@ char const cSuffixes[] = %!#@$;
  *
  * get/setText() only supports tools Strings limited to 64K).
  */
-rtl::OUString getTextEngineText (ExtTextEngine rEngine)
+OUString getTextEngineText (ExtTextEngine rEngine)
 {
 SvMemoryStream aMemStream;
 aMemStream.SetStreamCharSet( RTL_TEXTENCODING_UTF8 );
 aMemStream.SetLineDelimiter( LINEEND_LF );
 rEngine.Write( aMemStream );
 sal_uLong nSize = aMemStream.Tell();
-::rtl::OUString aText( (const sal_Char*)aMemStream.GetData(),
+OUString aText( (const sal_Char*)aMemStream.GetData(),
 nSize, RTL_TEXTENCODING_UTF8 );
 return aText;
 }
 
-void setTextEngineText (ExtTextEngine rEngine, rtl::OUString const aStr)
+void setTextEngineText (ExtTextEngine rEngine, OUString const aStr)
 {
 rEngine.SetText(String());
-::rtl::OString aUTF8Str = ::rtl::OUStringToOString( aStr, 
RTL_TEXTENCODING_UTF8 );
+OString aUTF8Str = ::rtl::OUStringToOString( aStr, RTL_TEXTENCODING_UTF8 );
 SvMemoryStream aMemStream( (void*)aUTF8Str.getStr(), aUTF8Str.getLength(),
 STREAM_READ | STREAM_SEEK_TO_BEGIN );
 aMemStream.SetStreamCharSet( RTL_TEXTENCODING_UTF8 );
@@ -237,9 +237,9 @@ EditorWindow::EditorWindow (Window* pParent, ModulWindow* 
pModulWindow) :
 osl::MutexGuard g(mutex_);
 notifier_ = n;
 }
-Sequence rtl::OUString  s(2);
-s[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(FontHeight));
-s[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(FontName));
+Sequence OUString  s(2);
+s[0] = OUString( FontHeight );
+s[1] = OUString( FontName );
 n-addPropertiesChangeListener(s, listener_.get());
 }
 
@@ -556,7 +556,7 @@ bool EditorWindow::SetSourceInBasic()
 
 // Returns the position of the last character of any of the following
 // EOL char combinations: CR, CR/LF, LF, return -1 if no EOL is found
-sal_Int32 searchEOL( const ::rtl::OUString rStr, sal_Int32 fromIndex )
+sal_Int32 searchEOL( const OUString rStr, sal_Int32 fromIndex )
 {
 sal_Int32 iRetPos = -1;
 
@@ -592,7 +592,7 @@ void EditorWindow::CreateEditEngine()
 
 bool bWasDoSyntaxHighlight = bDoSyntaxHighlight;
 bDoSyntaxHighlight = false; // too slow for large texts...
-rtl::OUString aOUSource(rModulWindow.GetModule());
+OUString aOUSource(rModulWindow.GetModule());
 sal_Int32 nLines = 0;
 sal_Int32 nIndex = -1;
 do
@@ -646,7 +646,7 @@ void EditorWindow::CreateEditEngine()
 
 // set readonly mode for readonly libraries
 ScriptDocument aDocument(rModulWindow.GetDocument());
-rtl::OUString aOULibName(rModulWindow.GetLibName());
+OUString aOULibName(rModulWindow.GetLibName());
 Reference script::XLibraryContainer2  xModLibContainer( 
aDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
 if ( xModLibContainer.is()  xModLibContainer-hasByName( aOULibName )  
xModLibContainer-isLibraryReadOnly( aOULibName ) )
 {
@@ -776,7 +776,7 @@ void EditorWindow::InitScrollBars()
 {
 rModulWindow.GetHScrollBar()-SetVisibleSize( aOutSz.Width() );
 rModulWindow.GetHScrollBar()-SetPageSize( aOutSz.Width() * 8 / 10 );
-rModulWindow.GetHScrollBar()-SetLineSize( GetTextWidth( 
rtl::OUString('x') ) );
+rModulWindow.GetHScrollBar()-SetLineSize( GetTextWidth( OUString('x') 
) );
 rModulWindow.GetHScrollBar()-SetThumbPos( 
pEditView-GetStartDocPos().X() );
 rModulWindow.GetHScrollBar()-Show();
 }
@@ -820,9 +820,9 @@ void EditorWindow::UpdateSyntaxHighlighting ()
 
 void EditorWindow::ImplSetFont()
 {
-rtl::OUString sFontName(
+OUString sFontName(
 officecfg::Office::Common::Font::SourceViewFont::FontName::get().
-get_value_or( rtl::OUString() ) );
+get_value_or( OUString() ) );
 if ( sFontName.isEmpty() )
 {
 Font aTmpFont( OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, 
Application::GetSettings().GetUILanguage(), 0 , this ) );
@@ -1361,8 +1361,8 @@ void WatchWindow::AddWatch( const String rVName )
 lcl_SeparateNameAndIndex( rVName, aVar, aIndex );
 WatchItem* pWatchItem = new WatchItem(aVar);
 
-String aWatchStr_( aVar );
-aWatchStr_ += String( RTL_CONSTASCII_USTRINGPARAM( \t\t ) );
+OUString aWatchStr_( aVar );
+aWatchStr_ +=

[Libreoffice-commits] .: basctl/source Makefile.top sfx2/source unusedcode.easy

2012-09-24 Thread Libreoffice Gerrit user

 Makefile.top |1 +
 basctl/source/basicide/basdoc.cxx|1 -
 sfx2/source/control/thumbnailviewacc.cxx |   14 --
 sfx2/source/control/thumbnailviewacc.hxx |2 --
 unusedcode.easy  |   23 ---
 5 files changed, 21 insertions(+), 20 deletions(-)

New commits:
commit 7528e11e372e43556cb7169f98aad39ac1e07332
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Sep 24 08:51:47 2012 +0100

callcatcher: update unused code lists

Change-Id: I58bad0806354eff2e91370ab3395199fa8691764

diff --git a/Makefile.top b/Makefile.top
index 6cbce02..2bc885a 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -526,6 +526,7 @@ findunusedcode:
   | grep -v ^WPG \
   | grep -v ^WPS \
   | grep -v WPX \
+  | grep -v ^WSObject \
unusedcode.easy
 
 check: dev-install subsequentcheck
diff --git a/basctl/source/basicide/basdoc.cxx 
b/basctl/source/basicide/basdoc.cxx
index 6f64fbc..119657c 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -36,7 +36,6 @@ namespace basctl
 {
 
 TYPEINIT1(DocShell, SfxObjectShell);
-DBG_NAME(DocShell);
 
 SFX_IMPL_OBJECTFACTORY( DocShell, SvGlobalName(), SFXOBJECTSHELL_STD_NORMAL, 
sbasic )
 
diff --git a/sfx2/source/control/thumbnailviewacc.cxx 
b/sfx2/source/control/thumbnailviewacc.cxx
index 5ba12d3..901cf41 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -668,20 +668,6 @@ const uno::Sequence sal_Int8  
ThumbnailViewItemAcc::getUnoTunnelId()
 return theValueItemAccUnoTunnelId::get().getSeq();
 }
 
-ThumbnailViewItemAcc* ThumbnailViewItemAcc::getImplementation( const 
uno::Reference uno::XInterface  rxData )
-throw()
-{
-try
-{
-uno::Reference lang::XUnoTunnel  xUnoTunnel( rxData, uno::UNO_QUERY 
);
-return( xUnoTunnel.is() ? 
reinterpret_castThumbnailViewItemAcc*(sal::static_int_castsal_IntPtr(xUnoTunnel-getSomething(
 ThumbnailViewItemAcc::getUnoTunnelId() ))) : NULL );
-}
-catch(const ::com::sun::star::uno::Exception)
-{
-return NULL;
-}
-}
-
 uno::Reference accessibility::XAccessibleContext  SAL_CALL 
ThumbnailViewItemAcc::getAccessibleContext()
 throw (uno::RuntimeException)
 {
diff --git a/sfx2/source/control/thumbnailviewacc.hxx 
b/sfx2/source/control/thumbnailviewacc.hxx
index cb061c7..e29f987 100644
--- a/sfx2/source/control/thumbnailviewacc.hxx
+++ b/sfx2/source/control/thumbnailviewacc.hxx
@@ -201,8 +201,6 @@ public:
 voidFireAccessibleEvent( short nEventId, const 
::com::sun::star::uno::Any rOldValue, const ::com::sun::star::uno::Any 
rNewValue );
 sal_BoolHasAccessibleListeners() const { return( 
mxEventListeners.size()  0 ); }
 
-static ThumbnailViewItemAcc* getImplementation( const 
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface  rxData ) 
throw();
-
 public:
 
 // XAccessible
diff --git a/unusedcode.easy b/unusedcode.easy
index 65239d1..9a307b0 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,5 +1,6 @@
 FontSelectPattern::FontSelectPattern(PhysicalFontFace const, Size const, 
float, int, bool)
 PopupMenu::SetSelectedEntry(unsigned short)
+RelatedMultipart::getIds()
 SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, 
unsigned int, unsigned char)
 ScMenuFloatingWindow::getDoc()
 
ScVbaFormatooo::vba::excel::XRange::setNumberFormat(com::sun::star::lang::Locale,
 rtl::OUString const)
@@ -19,11 +20,9 @@ ThumbnailView::GetItemCount() const
 ThumbnailView::ImplScroll(Point const)
 ThumbnailView::InsertItem(unsigned short, BitmapEx const, rtl::OUString 
const, unsigned long)
 ThumbnailViewItemAcc::FireAccessibleEvent(short, com::sun::star::uno::Any 
const, com::sun::star::uno::Any const)
-ThumbnailViewItemAcc::getImplementation(com::sun::star::uno::Referencecom::sun::star::uno::XInterface
 const)
 VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(Size const, Fraction 
const, Point const, boost::shared_arrayunsigned char const)
 Window::PostUserEvent(unsigned long, unsigned long, void*)
 XclExpPivotCache::GetFieldAcc(rtl::OUString const)
-basctl::DbgName_DocShell()
 binfilter::ImpSvtData::~ImpSvtData()
 binfilter::PCodeBuffConvertorunsigned int, unsigned short::GetBuffer()
 binfilter::PCodeBuffConvertorunsigned int, unsigned short::GetSize()
@@ -71,6 +70,13 @@ 
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptrco
 
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString
 const) const
 
comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptrcomphelper::ConfigurationChanges
 const, rtl::OUString const, com::sun::star::uno::Any const) const
 connectivity::file::OStatement_Base::reset()
+connectivity::mork::MQueryHelper::next()
+connectivity::mork::MQueryHelperResultEntry::insert(rtl::OString const,

[Libreoffice-commits] .: basctl/source

2012-09-07 Thread Libreoffice Gerrit user

 basctl/source/basicide/baside2.cxx  |4 +++
 basctl/source/basicide/baside3.cxx  |   41 +--
 basctl/source/basicide/basides1.cxx |   17 +
 basctl/source/basicide/iderdll.cxx  |2 -
 basctl/source/basicide/layout.hxx   |1 
 basctl/source/dlged/dlged.cxx   |   20 +--
 basctl/source/dlged/propbrw.cxx |   47 ++--
 basctl/source/inc/baside3.hxx   |   11 ++--
 basctl/source/inc/dlged.hxx |7 +++--
 basctl/source/inc/propbrw.hxx   |   30 --
 10 files changed, 71 insertions(+), 109 deletions(-)

New commits:
commit 7d5911e40855ac6234590e008927c9b819084ad0
Author: Uray M. JÃ¡nos uray.ja...@gmail.com
Date:   Fri Aug 31 12:44:47 2012 +0200

Basic IDE: Docking property browser under object catalog

Now the property browser can be docked in the same way as all other
dialogs in the Basic IDE and the Dialog Editor.
The property browser (PropBrw, for which PropertyBrowser would be a
better and easier-to-remember name IMO) is derived from
basctl::DockingWindow instead of SfxDockingWindow. PropBrwMgr was
removed (it seemed to be only a wrapper), and PropBrw is now a data
member of DialogWindowLayout (aPropertyBrowser).

Change-Id: I06737a5cbc985888432630714cb919d1bbbcbb49
Reviewed-on: https://gerrit.libreoffice.org/518
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index d0726d4..49a88f7 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1533,6 +1533,10 @@ void ModulWindowLayout::GetState (SfxItemSet rSet, 
unsigned nWhich)
 {
 switch (nWhich)
 {
+case SID_SHOW_PROPERTYBROWSER:
+rSet.Put(SfxVisibilityItem(nWhich, false));
+break;
+
 case SID_BASICIDE_CHOOSEMACRO:
 rSet.Put(SfxVisibilityItem(nWhich, true));
 break;
diff --git a/basctl/source/basicide/baside3.cxx 
b/basctl/source/basicide/baside3.cxx
index 6bfe6e4..3f87967 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -86,7 +86,7 @@ DialogWindow::DialogWindow (
 {
 InitSettings( true, true, true );
 
-pEditor = new DlgEditor( rDocument.isDocument() ? rDocument.getDocument() 
: Reference frame::XModel () );
+pEditor = new DlgEditor(rDocument.isDocument() ? rDocument.getDocument() : 
Referenceframe::XModel(), rLayout.aPropertyBrowser);
 pEditor-SetWindow( this );
 pEditor-SetDialog( xDialogModel );
 
@@ -683,20 +683,12 @@ bool DialogWindow::RenameDialog( const ::rtl::OUString 
rNewName )
 
 void DialogWindow::DisableBrowser()
 {
-Shell* pShell = GetShell();
-SfxViewFrame* pViewFrame = pShell ? pShell-GetViewFrame() : 0;
-SfxChildWindow* pChildWin = pViewFrame ? 
pViewFrame-GetChildWindow(SID_SHOW_PROPERTYBROWSER) : 0;
-if( pChildWin )
-((PropBrw*)(pChildWin-GetWindow()))-Update( NULL );
+rLayout.aPropertyBrowser.Update(0);
 }
 
 void DialogWindow::UpdateBrowser()
 {
-Shell* pShell = GetShell();
-SfxViewFrame* pViewFrame = pShell ? pShell-GetViewFrame() : 0;
-SfxChildWindow* pChildWin = pViewFrame ? 
pViewFrame-GetChildWindow(SID_SHOW_PROPERTYBROWSER) : 0;
-if( pChildWin )
-((PropBrw*)(pChildWin-GetWindow()))-Update( pShell );
+rLayout.aPropertyBrowser.Update(GetShell());
 }
 
 static ::rtl::OUString aResourceResolverPropName( RTL_CONSTASCII_USTRINGPARAM( 
ResourceResolver ));
@@ -1440,7 +1432,8 @@ ItemType DialogWindow::GetType () const
 DialogWindowLayout::DialogWindowLayout (Window* pParent, ObjectCatalog 
rObjectCatalog_) :
 Layout(pParent),
 pChild(0),
-rObjectCatalog(rObjectCatalog_)
+rObjectCatalog(rObjectCatalog_),
+aPropertyBrowser(*this)
 { }
 
 void DialogWindowLayout::Activating (BaseWindow rChild)
@@ -1450,6 +1443,7 @@ void DialogWindowLayout::Activating (BaseWindow rChild)
 rObjectCatalog.SetLayoutWindow(this);
 rObjectCatalog.UpdateEntries();
 rObjectCatalog.Show();
+aPropertyBrowser.Show();
 Layout::Activating(rChild);
 }
 
@@ -1457,13 +1451,33 @@ void DialogWindowLayout::Deactivating ()
 {
 Layout::Deactivating();
 rObjectCatalog.Hide();
+aPropertyBrowser.Hide();
 pChild = 0;
 }
 
+void DialogWindowLayout::ExecuteGlobal (SfxRequest rReq)
+{
+switch (rReq.GetSlot())
+{
+case SID_SHOW_PROPERTYBROWSER:
+// toggling property browser
+aPropertyBrowser.Show(!aPropertyBrowser.IsVisible());
+ArrangeWindows();
+// refresh the button state
+if (SfxBindings* pBindings = GetBindingsPtr())
+pBindings-Invalidate(SID_SHOW_PROPERTYBROWSER);
+break;
+}
+}
+
 void DialogWindowLayout::GetState (SfxItemSet rSet, unsigned nWhich)
 {
 switch (nWhich)
 {
+

[Libreoffice-commits] .: basctl/source

2012-09-07 Thread Libreoffice Gerrit user

 basctl/source/basicide/baside3.cxx |   83 +++--
 basctl/source/basicide/layout.cxx  |   43 ++-
 basctl/source/basicide/layout.hxx  |3 +
 basctl/source/dlged/dlged.cxx  |   10 ++--
 basctl/source/dlged/propbrw.cxx|7 ++-
 basctl/source/inc/baside3.hxx  |   14 --
 basctl/source/inc/dlged.hxx|6 +-
 basctl/source/inc/propbrw.hxx  |6 +-
 8 files changed, 144 insertions(+), 28 deletions(-)

New commits:
commit 5764c51f2c9870c91727464c0d889d3554a5663e
Author: Uray M. JÃ¡nos uray.ja...@gmail.com
Date:   Wed Sep 5 19:41:42 2012 +0200

Fix for docking property browser

This fixes the crash of 'Basic IDE: Docking property browser under
object catalog' commit. The aPropertyBrowser data member was replaced by
a new-allocated pointer. We need this because toolkit releases it by
delete.
When the property browser is closed in the floating state, it tells
DialogWindowLayout to null the pointer. If the user clicks the 'property
browser' button on the toolbar, it is created again.

Change-Id: Ie842a72fe37dfdd2ed5921ffa2f1f41d3f2c51c6
Reviewed-on: https://gerrit.libreoffice.org/568
Tested-by: Noel Power noel.po...@suse.com
Reviewed-by: Noel Power noel.po...@suse.com

diff --git a/basctl/source/basicide/baside3.cxx 
b/basctl/source/basicide/baside3.cxx
index 3f87967..ef03686 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -86,7 +86,7 @@ DialogWindow::DialogWindow (
 {
 InitSettings( true, true, true );
 
-pEditor = new DlgEditor(rDocument.isDocument() ? rDocument.getDocument() : 
Referenceframe::XModel(), rLayout.aPropertyBrowser);
+pEditor = new DlgEditor(rDocument.isDocument() ? rDocument.getDocument() : 
Referenceframe::XModel(), rLayout);
 pEditor-SetWindow( this );
 pEditor-SetDialog( xDialogModel );
 
@@ -683,12 +683,12 @@ bool DialogWindow::RenameDialog( const ::rtl::OUString 
rNewName )
 
 void DialogWindow::DisableBrowser()
 {
-rLayout.aPropertyBrowser.Update(0);
+rLayout.DisablePropertyBrowser();
 }
 
 void DialogWindow::UpdateBrowser()
 {
-rLayout.aPropertyBrowser.Update(GetShell());
+rLayout.UpdatePropertyBrowser();
 }
 
 static ::rtl::OUString aResourceResolverPropName( RTL_CONSTASCII_USTRINGPARAM( 
ResourceResolver ));
@@ -1433,8 +1433,56 @@ DialogWindowLayout::DialogWindowLayout (Window* pParent, 
ObjectCatalog rObjectC
 Layout(pParent),
 pChild(0),
 rObjectCatalog(rObjectCatalog_),
-aPropertyBrowser(*this)
-{ }
+pPropertyBrowser(0)
+{
+ShowPropertyBrowser();
+}
+
+// shows the property browser (and creates if neccessary)
+void DialogWindowLayout::ShowPropertyBrowser ()
+{
+// not exists?
+if (!pPropertyBrowser)
+{
+// creating
+pPropertyBrowser = new PropBrw(*this);
+// after OnFirstSize():
+if (HasSize())
+AddPropertyBrowser();
+// updating if neccessary
+UpdatePropertyBrowser();
+}
+pPropertyBrowser-Show();
+// refreshing the button state
+if (SfxBindings* pBindings = GetBindingsPtr())
+pBindings-Invalidate(SID_SHOW_PROPERTYBROWSER);
+}
+
+// disables the property browser
+void DialogWindowLayout::DisablePropertyBrowser ()
+{
+if (pPropertyBrowser)
+pPropertyBrowser-Update(0);
+}
+
+// updates the property browser
+void DialogWindowLayout::UpdatePropertyBrowser ()
+{
+if (pPropertyBrowser)
+pPropertyBrowser-Update(GetShell());
+}
+
+// Removes the property browser from the layout.
+// Called by PropBrw when closed. It'll destroy itself.
+void DialogWindowLayout::RemovePropertyBrowser ()
+{
+if (pPropertyBrowser)
+Remove(pPropertyBrowser);
+pPropertyBrowser = 0;
+// refreshing the button state
+if (SfxBindings* pBindings = GetBindingsPtr())
+pBindings-Invalidate(SID_SHOW_PROPERTYBROWSER);
+}
 
 void DialogWindowLayout::Activating (BaseWindow rChild)
 {
@@ -1443,7 +1491,8 @@ void DialogWindowLayout::Activating (BaseWindow rChild)
 rObjectCatalog.SetLayoutWindow(this);
 rObjectCatalog.UpdateEntries();
 rObjectCatalog.Show();
-aPropertyBrowser.Show();
+if (pPropertyBrowser)
+pPropertyBrowser-Show();
 Layout::Activating(rChild);
 }
 
@@ -1451,7 +1500,8 @@ void DialogWindowLayout::Deactivating ()
 {
 Layout::Deactivating();
 rObjectCatalog.Hide();
-aPropertyBrowser.Hide();
+if (pPropertyBrowser)
+pPropertyBrowser-Hide();
 pChild = 0;
 }
 
@@ -1461,9 +1511,12 @@ void DialogWindowLayout::ExecuteGlobal (SfxRequest rReq)
 {
 case SID_SHOW_PROPERTYBROWSER:
 // toggling property browser
-aPropertyBrowser.Show(!aPropertyBrowser.IsVisible());
+if (pPropertyBrowser  pPropertyBrowser-IsVisible())
+pPropertyBrowser-Hide();
+else
+ShowPropertyBrowser();

[Libreoffice-commits] .: basctl/source

2012-09-07 Thread Libreoffice Gerrit user

 basctl/source/inc/docsignature.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2d67eb7244b641728b91e070568bdb309149f5f4
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Sep 7 11:58:09 2012 +0200

-Werror,-Wmismatched-tags

Change-Id: Idc0830c4b893f55f56e0d322e87b4eff4a60d995

diff --git a/basctl/source/inc/docsignature.hxx 
b/basctl/source/inc/docsignature.hxx
index 9ec8852..b18601d 100644
--- a/basctl/source/inc/docsignature.hxx
+++ b/basctl/source/inc/docsignature.hxx
@@ -68,7 +68,7 @@ namespace basctl
 DocumentSignature();// not implemented
 
 private:
-class Impl;
+struct Impl;
 boost::scoped_ptrImpl m_pImpl;
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source vcl/AllLangResTarget_vcl.mk vcl/source

2012-08-30 Thread Libreoffice Gerrit user

 basctl/source/basicide/baside2b.cxx |   31 --
 vcl/AllLangResTarget_vcl.mk |1 
 vcl/source/edit/textund2.hxx|   15 -
 vcl/source/edit/textundo.cxx|  104 ++--
 vcl/source/edit/textundo.hrc|   28 +
 vcl/source/edit/textundo.hxx|5 +
 vcl/source/edit/textundo.src|   41 ++
 vcl/source/window/keycod.cxx|4 -
 8 files changed, 204 insertions(+), 25 deletions(-)

New commits:
commit 1191f4e432d3cb49662e6133411af3a2faf10a7a
Author: Uray M. JÃ¡nos uray.ja...@gmail.com
Date:   Thu Aug 30 10:18:14 2012 +0200

Undo/Redo description+shortcut in Basic IDE

This solves an issue about Edit  Redo in BasicIDE (Hungarian site):
http://bug.openscope.org/browse/OOO-269
1. Redo should have a shortcut (Ctrl+Y), like in other parts of
LibreOffice. (Undo has the usual Ctrl+Z.)
2. In the Edit menu, Undo and Redo should print something after the
colon (what is to be undone, redone).

This patch fixes both.
Unfortunately the shortcut isn't shown in the menu (it's in
vcl/source/window/keycod.cxx like Undo, and not in
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu).

Change-Id: I2cfbfeb7d57309a27676e48943633cdb194288bc
Reviewed-on: https://gerrit.libreoffice.org/514
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 41e31c7..a184d06 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -464,28 +464,23 @@ void EditorWindow::KeyInput( const KeyEvent rKEvt )
 
 if ( !bDone  ( !TextEngine::DoesKeyChangeText( rKEvt ) || ImpCanModify() 
 ) )
 {
-if ( ( rKEvt.GetKeyCode().GetCode() == KEY_Y )  
rKEvt.GetKeyCode().IsMod1() )
-bDone = true;
-else
+if ( ( rKEvt.GetKeyCode().GetCode() == KEY_TAB )  
!rKEvt.GetKeyCode().IsMod1() 
+  !rKEvt.GetKeyCode().IsMod2()  !GetEditView()-IsReadOnly() )
 {
-if ( ( rKEvt.GetKeyCode().GetCode() == KEY_TAB )  
!rKEvt.GetKeyCode().IsMod1() 
-  !rKEvt.GetKeyCode().IsMod2()  !GetEditView()-IsReadOnly() 
)
+TextSelection aSel( pEditView-GetSelection() );
+if ( aSel.GetStart().GetPara() != aSel.GetEnd().GetPara() )
 {
-TextSelection aSel( pEditView-GetSelection() );
-if ( aSel.GetStart().GetPara() != aSel.GetEnd().GetPara() )
-{
-bDelayHighlight = false;
-if ( !rKEvt.GetKeyCode().IsShift() )
-pEditView-IndentBlock();
-else
-pEditView-UnindentBlock();
-bDelayHighlight = true;
-bDone = true;
-}
+bDelayHighlight = false;
+if ( !rKEvt.GetKeyCode().IsShift() )
+pEditView-IndentBlock();
+else
+pEditView-UnindentBlock();
+bDelayHighlight = true;
+bDone = true;
 }
-if ( !bDone )
-bDone = pEditView-KeyInput( rKEvt );
 }
+if ( !bDone )
+bDone = pEditView-KeyInput( rKEvt );
 }
 if ( !bDone )
 {
diff --git a/vcl/AllLangResTarget_vcl.mk b/vcl/AllLangResTarget_vcl.mk
index 6fd8c1a..b6c557b 100644
--- a/vcl/AllLangResTarget_vcl.mk
+++ b/vcl/AllLangResTarget_vcl.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_SrsTarget_add_files,vcl/source/src,\
 vcl/source/src/stdtext.src \
 vcl/source/src/units.src \
 vcl/source/src/fpicker.src \
+vcl/source/edit/textundo.src \
 ))
 
 
diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx
index c5ce90c..153e3db 100644
--- a/vcl/source/edit/textund2.hxx
+++ b/vcl/source/edit/textund2.hxx
@@ -19,7 +19,8 @@
 #ifndef _TEXTUND2_HXX
 #define _TEXTUND2_HXX
 
-#include textundo.hxx
+#include textundo.hxx
+#include vcl/textdata.hxx
 
 
 class TextUndoDelPara : public TextUndo
@@ -36,6 +37,8 @@ public:
 
 virtual voidUndo();
 virtual voidRedo();
+
+virtual rtl::OUString GetComment () const;
 };
 
 
@@ -52,6 +55,8 @@ public:
 
 virtual voidUndo();
 virtual voidRedo();
+
+virtual rtl::OUString GetComment () const;
 };
 
 
@@ -68,6 +73,8 @@ public:
 
 virtual voidUndo();
 virtual voidRedo();
+
+virtual rtl::OUString GetComment () const;
 };
 
 
@@ -85,6 +92,8 @@ public:
 virtual voidRedo();
 
 virtual sal_BoolMerge( SfxUndoAction *pNextAction );
+
+virtual rtl::OUString GetComment () const;
 };
 
 
@@ -100,6 +109,8 @@ public:
 
 virtual voidUndo();
 virtual voidRedo();
+
+virtual rtl::OUString GetComment () const;
 };
 
 
@@ -115,6 +126,8 @@ public:
 
 virtual void

[Libreoffice-commits] .: basctl/source

2012-08-30 Thread Libreoffice Gerrit user

 basctl/source/basicide/bastype2.cxx |   31 +--
 1 file changed, 21 insertions(+), 10 deletions(-)

New commits:
commit f8182a1c53c2bc77444d58ffb140b39ea798
Author: Uray M. JÃ¡nos uray.ja...@gmail.com
Date:   Thu Aug 30 11:23:16 2012 +0200

Object Catalog: double-click to modules and dialogs

In Basic IDE in Object Catalog, only methods could be loaded by
double-click. Now modules and dialogs can be too.

Change-Id: If1c4412d2f6d35e6d1cbf48e700e2566dad9e97a
Reviewed-on: https://gerrit.libreoffice.org/515
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com

diff --git a/basctl/source/basicide/bastype2.cxx 
b/basctl/source/basicide/bastype2.cxx
index 40c84a2..4b8b1e4 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -907,17 +907,28 @@ void TreeListBox::MouseButtonDown( const MouseEvent 
rMEvt )
 SvTreeListBox::MouseButtonDown( rMEvt );
 if ( rMEvt.IsLeft()  ( rMEvt.GetClicks() == 2 ) )
 {
-EntryDescriptor aDesc( GetEntryDescriptor( GetCurEntry() ) );
-
-if ( aDesc.GetType() == OBJ_TYPE_METHOD )
+EntryDescriptor aDesc = GetEntryDescriptor(GetCurEntry());
+switch (aDesc.GetType())
 {
-if (SfxDispatcher* pDispatcher = GetDispatcher())
-{
-SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), 
aDesc.GetLibName(), aDesc.GetName(),
-aDesc.GetMethodName(), ConvertType( aDesc.GetType() ) );
-pDispatcher-Execute( SID_BASICIDE_SHOWSBX,
-SFX_CALLMODE_SYNCHRON, aSbxItem, 0L );
-}
+case OBJ_TYPE_METHOD:
+case OBJ_TYPE_MODULE:
+case OBJ_TYPE_DIALOG:
+if (SfxDispatcher* pDispatcher = GetDispatcher())
+{
+SbxItem aSbxItem(
+SID_BASICIDE_ARG_SBX, aDesc.GetDocument(),
+aDesc.GetLibName(), aDesc.GetName(), 
aDesc.GetMethodName(),
+ConvertType(aDesc.GetType())
+);
+pDispatcher-Execute(
+SID_BASICIDE_SHOWSBX,
+SFX_CALLMODE_SYNCHRON, aSbxItem, 0L
+);
+}
+break;
+
+default:
+break;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2012-08-17 Thread Caolán McNamara

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

New commits:
commit 0e843513a237024ab330e1d358f8ff4a952203a8
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Aug 17 17:17:42 2012 +0100

silence macosx uninitialized warning

Change-Id: I8472cf79aaf193ce63a1d2bfa9d329ad35ddd2c6

diff --git a/basctl/source/basicide/layout.cxx 
b/basctl/source/basicide/layout.cxx
index 684a26b..fdc2345 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -240,7 +240,7 @@ void Layout::SplittedSide::ArrangeIn (Rectangle const 
rRect)
 }
 
 // positioning separator lines and windows
-bool bPrevDocked; // is the previous window docked?
+bool bPrevDocked = false; // is the previous window docked?
 int nStartPos = nPos2; // window position in the strip
 for (unsigned i = 0; i != vWindows.size(); ++i)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source vcl/source

2012-08-16 Thread Cédric Bosdonnat

 basctl/source/basicide/baside2.cxx |9 +
 vcl/source/window/split.cxx|   56 +
 2 files changed, 30 insertions(+), 35 deletions(-)

New commits:
commit 9658704fc4c691dfea7411eb36951ddc5154538a
Author: Jean-Tiare LE BIGOT ad...@jtlebi.fr
Date:   Sun Aug 12 17:08:16 2012 -0400

Set ide sizer color to dark grey; was dark black

The color setting was picked from SplitWindow::Paint()
for visual consistency with the sizers used in Impress
for example.

This commit also resurects presumably dead code.
In fact GDB let me see that only the short path
was taken.

This has an impact on Calc's window splitters and
on more visibly on the basic IDE which now looks
much nicer :)

EDITS:
 restricted this commit impact to IDE as a poc

Change-Id: I9a051fd894feccff4bbc7db7efe1160cb2c3a2c6

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index fa2b050..3d2bfd8 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1397,6 +1397,15 @@ ModulWindowLayout::ModulWindowLayout( Window* pParent ) :
 {
 SetBackground(GetSettings().GetStyleSettings().GetWindowColor());
 
+Color splitterColor(GetSettings().GetStyleSettings().GetShadowColor());
+
+aLeftSplit.SetLineColor(splitterColor);
+aLeftSplit.SetFillColor(splitterColor);
+aBottomSplit.SetLineColor(splitterColor);
+aBottomSplit.SetFillColor(splitterColor);
+aVertSplit.SetLineColor(splitterColor);
+aVertSplit.SetFillColor(splitterColor);
+
 aLeftSplit.Show();
 aBottomSplit.Show();
 aVertSplit.Show();
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index ac2e9f7..d958c29 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -158,6 +158,9 @@ Splitter::Splitter( Window* pParent, WinBits nStyle ) :
 {
 ImplInitSplitterData();
 ImplInit( pParent, nStyle );
+
+SetLineColor();
+SetFillColor();
 }
 
 // ---
@@ -171,6 +174,9 @@ Splitter::Splitter( Window* pParent, const ResId rResId ) :
 ImplInit( pParent, nStyle );
 ImplLoadRes( rResId );
 
+SetLineColor();
+SetFillColor();
+
 if ( !(nStyle  WB_HIDE) )
 Show();
 }
@@ -748,46 +754,26 @@ void Splitter::DataChanged( const DataChangedEvent 
rDCEvt )
 
 void Splitter::Paint( const Rectangle rPaintRect )
 {
-if( HasFocus() || mbKbdSplitting )
-{
-Color oldFillCol = GetFillColor();
-Color oldLineCol = GetLineColor();
-
-SetLineColor();
-SetFillColor( GetSettings().GetStyleSettings().GetFaceColor() );
-DrawRect( rPaintRect );
-
-Color aSelectionBorderCol( 
GetSettings().GetStyleSettings().GetActiveColor() );
-SetFillColor( aSelectionBorderCol );
-SetLineColor();
-
-Polygon aPoly( rPaintRect );
-PolyPolygon aPolyPoly( aPoly );
-DrawTransparent( aPolyPoly, 85 );
+DrawRect( rPaintRect );
 
-SetLineColor( aSelectionBorderCol );
-SetFillColor();
+Polygon aPoly( rPaintRect );
+PolyPolygon aPolyPoly( aPoly );
+DrawTransparent( aPolyPoly, 85 );
 
-if( mbKbdSplitting )
-{
-LineInfo aInfo( LINE_DASH );
-//aInfo.SetDashLen( 2 );
-//aInfo.SetDashCount( 1 );
-aInfo.SetDistance( 1 );
-aInfo.SetDotLen( 2 );
-aInfo.SetDotCount( 1 );
-
-DrawPolyLine( aPoly, aInfo );
-}
-else
-DrawRect( rPaintRect );
-
-SetFillColor( oldFillCol);
-SetLineColor( oldLineCol);
+if( mbKbdSplitting )
+{
+LineInfo aInfo( LINE_DASH );
+//aInfo.SetDashLen( 2 );
+//aInfo.SetDashCount( 1 );
+aInfo.SetDistance( 1 );
+aInfo.SetDotLen( 2 );
+aInfo.SetDotCount( 3 );
+
+DrawPolyLine( aPoly, aInfo );
 }
 else
 {
-Window::Paint( rPaintRect );
+DrawRect( rPaintRect );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source unusedcode.easy

2012-08-10 Thread Julien Nabet

 basctl/source/basicide/bastypes.cxx |8 
 basctl/source/inc/bastypes.hxx  |1 -
 unusedcode.easy |1 -
 3 files changed, 10 deletions(-)

New commits:
commit 369da987d373bdf5bdabfeb11d4b2562c916f372
Author: Julien Nabet serval2...@yahoo.fr
Date:   Fri Aug 10 20:55:41 2012 +0200

Bin BasicDockingWindow( Window* pParent, const ResId rResId )

Change-Id: I84f4929eb923bc3d05bdf04a8958cb58b5bfb921

diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index ded9595..3aa29e6 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -252,14 +252,6 @@ BasicDockingWindow::BasicDockingWindow( Window* pParent ) :
 {
 }
 
-BasicDockingWindow::BasicDockingWindow( Window* pParent, const ResId rResId ) 
:
-DockingWindow( pParent, rResId )
-{
-SetStyle( WB_BORDER | WB_3DLOOK | WB_MOVEABLE |
-WB_SIZEABLE | WB_ROLLABLE |
-WB_DOCKABLE | WB_CLIPCHILDREN );
-}
-
 sal_Bool BasicDockingWindow::Docking( const Point rPos, Rectangle rRect )
 {
 ModulWindowLayout* pLayout = (ModulWindowLayout*)GetParent();
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 30fb847..90541a5 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -69,7 +69,6 @@ protected:
 
 public:
 BasicDockingWindow( Window* pParent );
-BasicDockingWindow( Window* pParent, const ResId rResId );
 };
 
 // helper class for sorting TabBar
diff --git a/unusedcode.easy b/unusedcode.easy
index ee2c76a..e4d051c 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,4 +1,3 @@
-BasicDockingWindow::BasicDockingWindow(Window*, ResId const)
 FontSelectPattern::FontSelectPattern(PhysicalFontFace const, Size const, 
float, int, bool)
 PlaceEditDialog::GetResId(unsigned short)
 PopupMenu::SetSelectedEntry(unsigned short)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2012-08-08 Thread Noel Power

 basctl/source/dlged/propbrw.cxx |8 
 basctl/source/inc/propbrw.hxx   |4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit f24cd7aadcd2eae3598f084804acb43c74835210
Author: Noel Power noel.po...@novell.com
Date:   Wed Aug 8 09:40:47 2012 +0100

make property browser dockable in basic IDE

very basic support for this, basicially you can dock the browser anywhere 
now
hence lots of behaviour niggles remain, e.g
1) it probably doesn't make sense to be able to dock the browser into top 
or bottom quadrants ( we need to implement the Docking ( maybe 
PrepareToggleFloating mode ) method(s) in PropBrw ( propbrw.cxx )
2) open floating or not ( if propertybrowswer is open )
3) should we leave the 'properties' context menu when selecting shapes in 
place or not
4) switching between Module and Dialog tabs, we probably should 'remember' 
docked position and state

Change-Id: Ibea4be3397eeac613642934662c3a9868fdf783b

diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index 3af451b..0c976ba 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -62,7 +62,7 @@ PropBrwMgr::PropBrwMgr( Window* _pParent, sal_uInt16 nId,
 );
 
 eChildAlignment = SFX_ALIGN_NOALIGNMENT;
-((SfxFloatingWindow*)pWindow)-Initialize( pInfo );
+((SfxDockingWindow*)pWindow)-Initialize( pInfo );
 
 ((PropBrw*)pWindow)-Update( pShell );
 }
@@ -100,7 +100,7 @@ DBG_NAME(PropBrw)
 
 PropBrw::PropBrw( const Reference XMultiServiceFactory  _xORB, SfxBindings* 
_pBindings, PropBrwMgr* _pMgr, Window* _pParent,
 const Reference XModel  _rxContextDocument )
-:SfxFloatingWindow( _pBindings, _pMgr, _pParent, WinBits( WB_STDMODELESS | 
WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE ) )
+:SfxDockingWindow( _pBindings, _pMgr, _pParent, WinBits( WB_DOCKABLE | 
WB_STDMODELESS | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE ) )
 ,m_bInitialStateChange(true)
 ,m_xORB(_xORB)
 ,m_xContextDocument( _rxContextDocument )
@@ -257,7 +257,7 @@ sal_Bool PropBrw::Close()
 if( IsRollUp() )
 RollDown();
 
-return SfxFloatingWindow::Close();
+return SfxDockingWindow::Close();
 }
 
 
@@ -455,7 +455,7 @@ void PropBrw::FillInfo( SfxChildWinInfo rInfo ) const
 
 void PropBrw::Resize()
 {
-SfxFloatingWindow::Resize();
+SfxDockingWindow::Resize();
 
 // adjust size
 Size aSize_ = GetOutputSizePixel();
diff --git a/basctl/source/inc/propbrw.hxx b/basctl/source/inc/propbrw.hxx
index 87c2e6c..0e7c2fc 100644
--- a/basctl/source/inc/propbrw.hxx
+++ b/basctl/source/inc/propbrw.hxx
@@ -23,7 +23,7 @@
 #include com/sun/star/beans/XPropertySet.hpp
 #include comphelper/stl_types.hxx
 #include sfx2/basedlgs.hxx
-#include sfx2/childwin.hxx
+#include sfx2/dockwin.hxx
 #include svl/lstner.hxx
 #include svx/svdmark.hxx
 
@@ -45,7 +45,7 @@ public:
 class SfxBindings;
 class SdrView;
 
-class PropBrw : public SfxFloatingWindow , public SfxListener, public 
SfxBroadcaster
+class PropBrw : public SfxDockingWindow , public SfxListener, public 
SfxBroadcaster
 {
 private:
 boolm_bInitialStateChange;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2012-08-08 Thread Stephan Bergmann

 basctl/source/basicide/baside2.cxx  |2 +-
 basctl/source/basicide/moduldl2.cxx |8 
 basctl/source/basicide/moduldlg.hxx |2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 934e051b16349a1ab6d2bdd9f03e60aaafcb2ec8
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Aug 8 11:37:42 2012 +0200

Some MSVC warnings

Change-Id: Ib4856779bb2060e3e95d24b8a00249e411f92b62

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index bb9ef6e..fa2b050 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1458,7 +1458,7 @@ void ModulWindowLayout::Paint( const Rectangle )
 void ModulWindowLayout::ArrangeWindows()
 {
 static long const nSplitThickness = 2;
-static float const
+static double const
 fDefaultLeftSplit = 0.2,
 fDefaultBottomSplit = 0.75,
 fDefaultVertSplit = 0.67;
diff --git a/basctl/source/basicide/moduldl2.cxx 
b/basctl/source/basicide/moduldl2.cxx
index 673f88a..6588d46 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -228,14 +228,14 @@ SvLBoxEntry* BasicCheckBox::FindEntry( const String 
rName )
 
 //
 
-void BasicCheckBox::CheckEntryPos( sal_uLong nPos, bool bCheck )
+void BasicCheckBox::CheckEntryPos( sal_uLong nPos )
 {
 if ( nPos  GetEntryCount() )
 {
 SvLBoxEntry* pEntry = GetEntry( nPos );
 
-if ( bCheck != GetCheckButtonState( pEntry ) )
-SetCheckButtonState( pEntry, SvButtonState(bCheck ? 
SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED) );
+if ( GetCheckButtonState( pEntry ) != SV_BUTTON_CHECKED )
+SetCheckButtonState( pEntry, SvButtonState(SV_BUTTON_CHECKED) );
 }
 }
 
@@ -895,7 +895,7 @@ void LibPage::InsertLib()
 {
 SvLBoxEntry* pEntry = pLibDlg-GetLibBox().DoInsertEntry( 
aLibName );
 sal_uInt16 nPos = (sal_uInt16) 
pLibDlg-GetLibBox().GetModel()-GetAbsPos( pEntry );
-pLibDlg-GetLibBox().CheckEntryPos(nPos, true);
+pLibDlg-GetLibBox().CheckEntryPos(nPos);
 }
 }
 
diff --git a/basctl/source/basicide/moduldlg.hxx 
b/basctl/source/basicide/moduldlg.hxx
index a86f94b..81fff6a 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -132,7 +132,7 @@ public:
 SvLBoxEntry*DoInsertEntry( const String rStr, sal_uLong nPos = 
LISTBOX_APPEND );
 SvLBoxEntry*FindEntry( const String rName );
 
-voidCheckEntryPos( sal_uLong nPos, bool bCheck = true );
+voidCheckEntryPos( sal_uLong nPos );
 boolIsChecked( sal_uLong nPos ) const;
 
 virtual voidInitEntry( SvLBoxEntry*, const XubString, const Image, 
const Image, SvLBoxButtonKind eButtonKind );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2012-08-07 Thread Tor Lillqvist

 basctl/source/accessibility/accessibledialogwindow.cxx |   12 ++--
 basctl/source/basicide/baside2b.cxx|   10 +-
 basctl/source/basicide/basides1.cxx|6 +++---
 basctl/source/basicide/basidesh.cxx|4 ++--
 basctl/source/basicide/basobj3.cxx |6 +++---
 basctl/source/basicide/bastype3.cxx|2 +-
 basctl/source/basicide/localizationmgr.cxx |2 +-
 basctl/source/basicide/tbxctl.cxx  |5 +++--
 basctl/source/dlged/dlgedobj.cxx   |2 +-
 9 files changed, 25 insertions(+), 24 deletions(-)

New commits:
commit 5f3a75f97e4c4235c865c2687c3bfca37e19811b
Author: Uray M. JÃ¡nos uray.ja...@gmail.com
Date:   Tue Aug 7 15:22:25 2012 +0200

IDE: dynamic_cast fix

Change-Id: Ia8826be6e6fe7c09adb4f0104b52ceba6b89163b

diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx 
b/basctl/source/accessibility/accessibledialogwindow.cxx
index 2982cda..4621e7e 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -513,15 +513,15 @@ awt::Rectangle AccessibleDialogWindow::implGetBounds() 
throw (RuntimeException)
 
 void AccessibleDialogWindow::Notify( SfxBroadcaster, const SfxHint rHint )
 {
-if (SdrHint* pSdrHint = dynamic_castSdrHint*(rHint))
+if (SdrHint const* pSdrHint = dynamic_castSdrHint const*(rHint))
 {
 switch ( pSdrHint-GetKind() )
 {
 case HINT_OBJINSERTED:
 {
-if (DlgEdObj* pDlgEdObj = 
dynamic_castDlgEdObj*(pSdrHint-GetObject()))
+if (DlgEdObj const* pDlgEdObj = dynamic_castDlgEdObj 
const*(pSdrHint-GetObject()))
 {
-ChildDescriptor aDesc( pDlgEdObj );
+ChildDescriptor aDesc(const_castDlgEdObj*(pDlgEdObj));
 if ( IsChildVisible( aDesc ) )
 InsertChild( aDesc );
 }
@@ -529,14 +529,14 @@ void AccessibleDialogWindow::Notify( SfxBroadcaster, 
const SfxHint rHint )
 break;
 case HINT_OBJREMOVED:
 {
-if (DlgEdObj* pDlgEdObj = 
dynamic_castDlgEdObj*(pSdrHint-GetObject()))
-RemoveChild( ChildDescriptor( pDlgEdObj ) );
+if (DlgEdObj const* pDlgEdObj = dynamic_castDlgEdObj 
const*(pSdrHint-GetObject()))
+RemoveChild( 
ChildDescriptor(const_castDlgEdObj*(pDlgEdObj)) );
 }
 break;
 default: ;
 }
 }
-else if (DlgEdHint* pDlgEdHint = dynamic_castDlgEdHint*(rHint))
+else if (DlgEdHint const* pDlgEdHint = dynamic_castDlgEdHint 
const*(rHint))
 {
 switch ( pDlgEdHint-GetKind() )
 {
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 0f11e84..dd6337e 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -54,10 +54,10 @@ long nVirtToolBoxHeight;// inited in WatchWindow, used 
in Stackwindow
 long nHeaderBarHeight;
 
 // Returns pBase converted to SbxVariable if valid and is not an SbxMethod.
-SbxVariable const* IsSbxVariable (SbxBase const* pBase)
+SbxVariable* IsSbxVariable (SbxBase* pBase)
 {
-if (SbxVariable const* pVar = dynamic_castSbxVariable const*(pBase))
-if (!dynamic_castSbxMethod const*(pVar))
+if (SbxVariable* pVar = dynamic_castSbxVariable*(pBase))
+if (!dynamic_castSbxMethod*(pVar))
 return pVar;
 return 0;
 }
@@ -1933,7 +1933,7 @@ sal_Bool WatchTreeListBox::EditingEntry( SvLBoxEntry* 
pEntry, Selection )
 {
 // No out of scope entries
 bool bArrayElement;
-SbxBase const* pSbx = ImplGetSBXForEntry( pEntry, bArrayElement );
+SbxBase* pSbx = ImplGetSBXForEntry( pEntry, bArrayElement );
 if (IsSbxVariable(pSbx) || bArrayElement)
 {
 // Accept no objects and only end nodes of arrays for editing
@@ -1970,7 +1970,7 @@ bool WatchTreeListBox::ImplBasicEntryEdited( SvLBoxEntry* 
pEntry, const String
 bool bArrayElement;
 SbxBase* pSBX = ImplGetSBXForEntry( pEntry, bArrayElement );
 
-if (SbxVariable const* pVar = IsSbxVariable(pSBX))
+if (SbxVariable* pVar = IsSbxVariable(pSBX))
 {
 SbxDataType eType = pVar-GetType();
 if ( (sal_uInt8)eType != (sal_uInt8)SbxOBJECT
diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index 06ed752..97447f4 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -160,7 +160,7 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest rReq )
 {
 IDEBaseWindow* pWin = it-second;
 if (!pWin-IsSuspended())
-if (pModulWindow* pMWin =

[Libreoffice-commits] .: basctl/source

2012-08-02 Thread Noel Power

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

New commits:
commit 8ba8aca1ac4744a23eefb7bb5892e2a697d9d987
Author: Noel Power noel.po...@novell.com
Date:   Thu Aug 2 16:56:36 2012 +0100

fix for fdo#47907

Change-Id: Ia5e4e7429db122db505d59289b1106814ea7c378

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index a5702c1..c3223c6 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -682,7 +682,6 @@ void EditorWindow::Notify( SfxBroadcaster /*rBC*/, const 
SfxHint rHint )
 ( 0, pModulWindow-GetBreakPointWindow().GetCurYOffset() - 
pEditView-GetStartDocPos().Y() );
 pModulWindow-GetLineNumberWindow().DoScroll
 ( 0, pModulWindow-GetLineNumberWindow().GetCurYOffset() - 
pEditView-GetStartDocPos().Y() );
-pModulWindow-Invalidate();
 }
 else if( rTextHint.GetId() == TEXT_HINT_TEXTHEIGHTCHANGED )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-08-02 Thread Takeshi Abe

 basctl/source/dlged/dlged.cxx|2 -
 basctl/source/dlged/dlgedobj.cxx |   30 +++
 basctl/source/inc/dlgedobj.hxx   |2 -
 basic/source/comp/buffer.cxx |   50 +++
 basic/source/comp/codegen.cxx|6 ++--
 basic/source/inc/buffer.hxx  |   16 ++--
 basic/source/inc/codegen.hxx |2 -
 7 files changed, 54 insertions(+), 54 deletions(-)

New commits:
commit 621145a777ec6ac918bd822bfc4ece1f75900bb1
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Fri Aug 3 10:28:32 2012 +0900

sal_Bool - bool

Change-Id: I49749f327d6a9c3661ef9bd684647e0a45b9203a

diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 056ffaa..9f52b82 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -551,7 +551,7 @@ IMPL_LINK_NOARG(DlgEditor, PaintTimeout)
 
 // set dialog position and size
 pDlgEdForm-SetSnapRect( Rectangle( aPos, aSize ) );
-pDlgEdForm-EndListening(sal_False);
+pDlgEdForm-EndListening(false);
 pDlgEdForm-SetPropsFromRect();
 pDlgEdForm-GetDlgEditor()-SetDialogModelChanged(sal_True);
 pDlgEdForm-StartListening();
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index c412f1a..518048f 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -472,7 +472,7 @@ void DlgEdObj::PositionAndSizeChange( const 
beans::PropertyChangeEvent evt )
 {
 Any aNewValue;
 aNewValue = nNewValue;
-EndListening( sal_False );
+EndListening( false );
 xPSet-setPropertyValue( evt.PropertyName, aNewValue );
 StartListening();
 }
@@ -523,7 +523,7 @@ void SAL_CALL DlgEdObj::NameChange( const  
::com::sun::star::beans::PropertyChan
 else
 {
 // set old name property
-EndListening(sal_False);
+EndListening(false);
 Reference beans::XPropertySet   xPSet(GetUnoControlModel(), 
UNO_QUERY);
 Any aName;
 aName = aOldName;
@@ -588,7 +588,7 @@ void DlgEdObj::TabIndexChange( const 
beans::PropertyChangeEvent evt ) throw (Ru
 ::std::vectorDlgEdObj*::iterator aIter;
 for ( aIter = aChildList.begin() ; aIter != aChildList.end() ; ++aIter 
)
 {
-(*aIter)-EndListening( sal_False );
+(*aIter)-EndListening( false );
 }
 
 Reference container::XNameAccess  xNameAcc( 
pForm-GetUnoControlModel() , UNO_QUERY );
@@ -990,7 +990,7 @@ void DlgEdObj::NbcMove( const Size rSize )
 SdrUnoObj::NbcMove( rSize );
 
 // stop listening
-EndListening(sal_False);
+EndListening(false);
 
 // set geometry properties
 SetPropsFromRect();
@@ -1009,7 +1009,7 @@ void DlgEdObj::NbcResize(const Point rRef, const 
Fraction xFract, const Fracti
 SdrUnoObj::NbcResize( rRef, xFract, yFract );
 
 // stop listening
-EndListening(sal_False);
+EndListening(false);
 
 // set geometry properties
 SetPropsFromRect();
@@ -1161,7 +1161,7 @@ void DlgEdObj::StartListening()
 
 //
 
-void DlgEdObj::EndListening(sal_Bool bRemoveListener)
+void DlgEdObj::EndListening(bool bRemoveListener)
 {
 DBG_ASSERT(isListening(), DlgEdObj::EndListening: not listening 
currently!);
 
@@ -1481,7 +1481,7 @@ void DlgEdForm::PositionAndSizeChange( const 
beans::PropertyChangeEvent evt )
 {
 Any aNewValue;
 aNewValue = nNewValue;
-EndListening( sal_False );
+EndListening( false );
 xPSetForm-setPropertyValue( evt.PropertyName, 
aNewValue );
 StartListening();
 }
@@ -1523,7 +1523,7 @@ void DlgEdForm::PositionAndSizeChange( const 
beans::PropertyChangeEvent evt )
 {
 Any aValue;
 aValue = nNewX;
-EndListening( sal_False );
+EndListening( false );
 xPSet-setPropertyValue( DLGED_PROP_POSITIONX, 
aValue );
 StartListening();
 }
@@ -1539,7 +1539,7 @@ void DlgEdForm::PositionAndSizeChange( const 
beans::PropertyChangeEvent evt )
 {
 Any aValue;
 aValue = nNewY;
-EndListening( sal_False );
+EndListening( false );
 xPSet-setPropertyValue(

[Libreoffice-commits] .: basctl/source

2012-08-01 Thread Takeshi Abe

 basctl/source/basicide/baside3.cxx  |6 +++---
 basctl/source/basicide/basides1.cxx |4 ++--
 basctl/source/basicide/basides2.cxx |4 ++--
 basctl/source/basicide/basides3.cxx |4 ++--
 basctl/source/basicide/basidesh.cxx |   14 +++---
 basctl/source/basicide/basobj2.cxx  |2 +-
 basctl/source/basicide/basobj3.cxx  |2 +-
 basctl/source/dlged/dlged.cxx   |6 +++---
 basctl/source/inc/baside3.hxx   |2 +-
 basctl/source/inc/basidesh.hxx  |8 
 basctl/source/inc/dlged.hxx |2 +-
 11 files changed, 27 insertions(+), 27 deletions(-)

New commits:
commit d73ef723a280fc45f24b96e76c4edea112b29994
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Thu Aug 2 10:21:00 2012 +0900

sal_Bool - bool

Change-Id: Id2addfc6e0c4e0b30281c9f3d22ec0624a61dab1

diff --git a/basctl/source/basicide/baside3.cxx 
b/basctl/source/basicide/baside3.cxx
index fd6e2f7..6083fbd 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -74,7 +74,7 @@ DialogWindow::DialogWindow( Window* pParent, const 
ScriptDocument rDocument, ::
 :IDEBaseWindow( pParent, rDocument, aLibName, aName )
 ,pUndoMgr(NULL)
 {
-InitSettings( sal_True, sal_True, sal_True );
+InitSettings( true, true, true );
 
 pEditor = new DlgEditor( rDocument.isDocument() ? rDocument.getDocument() 
: Reference frame::XModel () );
 pEditor-SetWindow( this );
@@ -1382,14 +1382,14 @@ void DialogWindow::DataChanged( const DataChangedEvent 
rDCEvt )
 {
 if( (rDCEvt.GetType()==DATACHANGED_SETTINGS)  (rDCEvt.GetFlags()  
SETTINGS_STYLE) )
 {
-InitSettings( sal_True, sal_True, sal_True );
+InitSettings( true, true, true );
 Invalidate();
 }
 else
 IDEBaseWindow::DataChanged( rDCEvt );
 }
 
-void DialogWindow::InitSettings(sal_Bool bFont,sal_Bool bForeground,sal_Bool 
bBackground)
+void DialogWindow::InitSettings(bool bFont, bool bForeground, bool bBackground)
 {
 const StyleSettings rStyleSettings = GetSettings().GetStyleSettings();
 if( bFont )
diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index 86af285..d62d81e 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -633,7 +633,7 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest rReq )
 DBG_ASSERT( rReq.GetArgs(), arguments expected );
 const SbxItem rSbxItem = (const 
SbxItem)rReq.GetArgs()-Get(SID_BASICIDE_ARG_SBX );
 ScriptDocument aDocument( rSbxItem.GetDocument() );
-IDEBaseWindow* pWin = FindWindow( aDocument, 
rSbxItem.GetLibName(), rSbxItem.GetName(), rSbxItem.GetType(), sal_True );
+IDEBaseWindow* pWin = FindWindow( aDocument, 
rSbxItem.GetLibName(), rSbxItem.GetName(), rSbxItem.GetType(), true );
 if ( pWin )
 RemoveWindow( pWin, true );
 }
@@ -1268,7 +1268,7 @@ IDEBaseWindow* BasicIDEShell::FindApplicationWindow()
 return FindWindow( ScriptDocument::getApplicationScriptDocument() );
 }
 
-IDEBaseWindow* BasicIDEShell::FindWindow( const ScriptDocument rDocument, 
const ::rtl::OUString rLibName, const ::rtl::OUString rName, BasicIDEType 
nType, sal_Bool bFindSuspended )
+IDEBaseWindow* BasicIDEShell::FindWindow( const ScriptDocument rDocument, 
const ::rtl::OUString rLibName, const ::rtl::OUString rName, BasicIDEType 
nType, bool bFindSuspended )
 {
 for( IDEWindowTable::const_iterator it = aIDEWindowTable.begin(); it != 
aIDEWindowTable.end(); ++it )
 {
diff --git a/basctl/source/basicide/basides2.cxx 
b/basctl/source/basicide/basides2.cxx
index 13db522..5ff0a81 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -174,7 +174,7 @@ void BasicIDEShell::CreateModulWindowLayout()
 
 ModulWindow* BasicIDEShell::CreateBasWin( const ScriptDocument rDocument, 
const ::rtl::OUString rLibName, const ::rtl::OUString rModName )
 {
-bCreatingWindow = sal_True;
+bCreatingWindow = true;
 
 sal_uLong nKey = 0;
 ModulWindow* pWin = 0;
@@ -243,7 +243,7 @@ ModulWindow* BasicIDEShell::CreateBasWin( const 
ScriptDocument rDocument, const
 if ( !pCurWin )
 SetCurWindow( pWin, false, false );
 
-bCreatingWindow = sal_False;
+bCreatingWindow = false;
 return pWin;
 }
 
diff --git a/basctl/source/basicide/basides3.cxx 
b/basctl/source/basicide/basides3.cxx
index b4a7849..c0529f1 100644
--- a/basctl/source/basicide/basides3.cxx
+++ b/basctl/source/basicide/basides3.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star::io;
 
 DialogWindow* BasicIDEShell::CreateDlgWin( const ScriptDocument rDocument, 
const ::rtl::OUString rLibName, const ::rtl::OUString rDlgName )
 {
-bCreatingWindow = sal_True;
+bCreatingWindow = true;
 
 sal_uLong nKey = 0;
 DialogWindow* pWin = 0;
@@ -111,7 +111,7 @@ DialogWindow* BasicIDEShell::CreateDlgWin( const 
ScriptDocument rDocument, cons

[Libreoffice-commits] .: basctl/source

2012-07-31 Thread Takeshi Abe

 basctl/source/accessibility/accessibledialogwindow.cxx |6 +++---
 basctl/source/basicide/baside3.cxx |6 +++---
 basctl/source/basicide/moduldl2.cxx|   16 
 basctl/source/basicide/moduldlg.cxx|6 +++---
 basctl/source/dlged/dlgedfunc.cxx  |6 +++---
 basctl/source/dlged/dlgedobj.cxx   |8 
 basctl/source/dlged/propbrw.cxx|4 ++--
 basctl/source/inc/accessibledialogwindow.hxx   |2 +-
 basctl/source/inc/baside3.hxx  |2 +-
 basctl/source/inc/dlgedfunc.hxx|2 +-
 basctl/source/inc/dlgedobj.hxx |4 ++--
 basctl/source/inc/propbrw.hxx  |2 +-
 12 files changed, 32 insertions(+), 32 deletions(-)

New commits:
commit 088915c36ba207591a3d97e94bcf1a395bfa69ed
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Wed Aug 1 10:05:20 2012 +0900

sal_Bool - bool

Change-Id: I82157e89d04eda35525c5a540504e6a8d18bc86c

diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx 
b/basctl/source/accessibility/accessibledialogwindow.cxx
index 7a45247..987dbc8 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -214,9 +214,9 @@ void AccessibleDialogWindow::UpdateBounds()
 
 // 
-
 
-sal_Bool AccessibleDialogWindow::IsChildVisible( const ChildDescriptor rDesc )
+bool AccessibleDialogWindow::IsChildVisible( const ChildDescriptor rDesc )
 {
-sal_Bool bVisible = sal_False;
+bool bVisible = false;
 
 if ( m_pDialogWindow )
 {
@@ -250,7 +250,7 @@ sal_Bool AccessibleDialogWindow::IsChildVisible( const 
ChildDescriptor rDesc )
 // check, if the shape's bounding box intersects with 
the bounding box of its parent
 Rectangle aParentRect( Point( 0, 0 ), 
m_pDialogWindow-GetSizePixel() );
 if ( aParentRect.IsOver( aRect ) )
-bVisible = sal_True;
+bVisible = true;
 }
 }
 }
diff --git a/basctl/source/basicide/baside3.cxx 
b/basctl/source/basicide/baside3.cxx
index cad5d8c..fd6e2f7 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -661,16 +661,16 @@ Reference container::XNameContainer  
DialogWindow::GetDialog() const
 return pEditor-GetDialog();
 }
 
-sal_Bool DialogWindow::RenameDialog( const ::rtl::OUString rNewName )
+bool DialogWindow::RenameDialog( const ::rtl::OUString rNewName )
 {
 if ( !BasicIDE::RenameDialog( this, GetDocument(), GetLibName(), 
GetName(), rNewName ) )
-return sal_False;
+return false;
 
 SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
 if ( pBindings )
 pBindings-Invalidate( SID_DOC_MODIFIED );
 
-return sal_True;
+return true;
 }
 
 void DialogWindow::DisableBrowser()
diff --git a/basctl/source/basicide/moduldl2.cxx 
b/basctl/source/basicide/moduldl2.cxx
index 6c9aacd..d68603e 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -906,7 +906,7 @@ void LibPage::InsertLib()
 InfoBox( this, IDE_RESSTR(RID_STR_NOLIBINSTORAGE) ).Execute();
 else
 {
-sal_Bool bChanges = sal_False;
+bool bChanges = false;
 ::rtl::OUString aExtension( aURLObj.getExtension() );
 ::rtl::OUString 
aLibExtension(RTL_CONSTASCII_USTRINGPARAM(xlb));
 ::rtl::OUString 
aContExtension(RTL_CONSTASCII_USTRINGPARAM(xlc));
@@ -918,7 +918,7 @@ void LibPage::InsertLib()
 if ( pLibDlg-Execute() )
 {
 sal_uLong nNewPos = aLibBox.GetEntryCount();
-sal_Bool bRemove = sal_False;
+bool bRemove = false;
 sal_Bool bReplace = pLibDlg-IsReplace();
 sal_Bool bReference = pLibDlg-IsReference();
 for ( sal_uInt16 nLib = 0; nLib  
pLibDlg-GetLibBox().GetEntryCount(); nLib++ )
@@ -957,7 +957,7 @@ void LibPage::InsertLib()
 }
 
 // remove existing libraries
-bRemove = sal_True;
+bRemove = true;
 }
 else
 {
@@ -1134,7 +1134,7 @@ void LibPage::InsertLib()
 
 // insert listbox entry
 ImpInsertLibEntry( aLibName, 
aLibBox.GetEntryCount() );
-bChanges = sal_True;
+bChanges = true;

[Libreoffice-commits] .: basctl/source

2012-07-30 Thread Takeshi Abe

 basctl/source/basicide/baside3.cxx  |2 +-
 basctl/source/basicide/basides1.cxx |   17 -
 basctl/source/basicide/basides2.cxx |2 +-
 basctl/source/basicide/basidesh.cxx |   34 +-
 basctl/source/basicide/basobj2.cxx  |   12 ++--
 basctl/source/basicide/bastype2.cxx |   10 +-
 basctl/source/inc/basidesh.hxx  |   10 +-
 basctl/source/inc/basobj.hxx|2 +-
 8 files changed, 44 insertions(+), 45 deletions(-)

New commits:
commit 6e6564e60605dded9b0514b82c168e7f88f6e7db
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Tue Jul 31 10:14:06 2012 +0900

sal_Bool - bool

Change-Id: Ic982c4da144ecdf7198b84b98d672ced8f1f70b6

diff --git a/basctl/source/basicide/baside3.cxx 
b/basctl/source/basicide/baside3.cxx
index 5038740..cad5d8c 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -1201,7 +1201,7 @@ bool implImportDialog( Window* pWin, const 
::rtl::OUString rCurPath, const Scri
 {
 IDEBaseWindow* pDlgWin = pIDEShell-FindDlgWin( rDocument, 
aLibName, aNewDlgName, false, true );
 if( pDlgWin != NULL )
-pIDEShell-RemoveWindow( pDlgWin, sal_True );
+pIDEShell-RemoveWindow( pDlgWin, true );
 BasicIDE::MarkDocumentModified( rDocument );
 }
 else
diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index f4eb16d..86af285 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -1,4 +1,3 @@
-
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
@@ -95,7 +94,7 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest rReq )
 case SID_BASICIDE_HIDECURPAGE:
 {
 pCurWin-StoreData();
-RemoveWindow( pCurWin, sal_False );
+RemoveWindow( pCurWin, false );
 }
 break;
 case SID_BASICIDE_DELETECURRENT:
@@ -120,7 +119,7 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest rReq )
 {
 if ( BasicIDE::RemoveDialog( aDocument, aLibName, aName ) )
 {
-RemoveWindow( pCurWin, sal_True );
+RemoveWindow( pCurWin, true );
 BasicIDE::MarkDocumentModified( aDocument );
 }
 }
@@ -578,7 +577,7 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest rReq )
 {
 if ( m_aCurLibName.isEmpty() || ( aDocument == m_aCurDocument 
 aLibName == m_aCurLibName ) )
 {
-RemoveWindows( aDocument, aLibName, sal_True );
+RemoveWindows( aDocument, aLibName, true );
 if ( aDocument == m_aCurDocument  aLibName == 
m_aCurLibName )
 {
 m_aCurDocument = 
ScriptDocument::getApplicationScriptDocument();
@@ -636,7 +635,7 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest rReq )
 ScriptDocument aDocument( rSbxItem.GetDocument() );
 IDEBaseWindow* pWin = FindWindow( aDocument, 
rSbxItem.GetLibName(), rSbxItem.GetName(), rSbxItem.GetType(), sal_True );
 if ( pWin )
-RemoveWindow( pWin, sal_True );
+RemoveWindow( pWin, true );
 }
 break;
 case SID_BASICIDE_SHOWSBX:
@@ -1119,7 +1118,7 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, 
bool bUpdateTabBar, bo
 pModulLayout-Show();
 AdjustPosSizePixel( Point( 0, 0 ), 
GetViewFrame()-GetWindow().GetOutputSizePixel() );
 SetWindow( pModulLayout );
-EnableScrollbars( sal_False );
+EnableScrollbars( false );
 aVScrollBar.Hide();
 }
 
@@ -1209,7 +1208,7 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, 
bool bUpdateTabBar, bo
 pModulLayout-GetObjectCatalog().SetCurrentEntry(pCurWin);
 SetUndoManager( pCurWin ? pCurWin-GetUndoManager() : 0 );
 InvalidateBasicIDESlots();
-EnableScrollbars( pCurWin ? sal_True : sal_False );
+EnableScrollbars( pCurWin ? true : false );
 
 if ( m_pCurLocalizationMgr )
 m_pCurLocalizationMgr-handleTranslationbar();
@@ -1426,7 +1425,7 @@ void BasicIDEShell::Activate( sal_Bool bMDI )
 if( pCurWin  pCurWin-IsA( TYPE( DialogWindow ) ) )
 ((DialogWindow*)pCurWin)-UpdateBrowser();
 
-ShowObjectDialog( sal_True, sal_False );
+ShowObjectDialog( true, false );
 }
 }
 
@@ -1458,7 +1457,7 @@ void BasicIDEShell::Deactivate( sal_Bool bMDI )
 }
 }
 
-ShowObjectDialog( sal_False, sal_False );
+ShowObjectDialog( false, false );
 }
 }
 
diff --git a/basctl/source/basicide/basides2.cxx

[Libreoffice-commits] .: basctl/source basic/source cui/source formula/source sc/source sd/source sfx2/source starmath/source svtools/source svx/inc svx/source svx/workben sw/source vcl/inc vcl/Librar

2012-07-29 Thread Thomas Arnhold

 basctl/source/basicide/baside2.cxx   |1 
 basctl/source/basicide/baside2b.cxx  |1 
 basctl/source/basicide/basides2.cxx  |1 
 basctl/source/basicide/brkdlg.cxx|1 
 basctl/source/basicide/objdlg.cxx|1 
 basic/source/runtime/methods.cxx |1 
 basic/source/sbx/sbxobj.cxx  |1 
 cui/source/dialogs/colorpicker.cxx   |1 
 cui/source/dialogs/cuicharmap.cxx|5 -
 cui/source/dialogs/cuitbxform.cxx|1 
 formula/source/ui/dlg/funcutl.cxx|1 
 sc/source/core/data/documen4.cxx |1 
 sc/source/ui/app/inputhdl.cxx|1 
 sc/source/ui/docshell/docfunc.cxx|1 
 sc/source/ui/docshell/olinefun.cxx   |1 
 sc/source/ui/navipi/content.cxx  |1 
 sc/source/ui/navipi/navipi.cxx   |1 
 sc/source/ui/view/dbfunc3.cxx|1 
 sc/source/ui/view/editsh.cxx |1 
 sc/source/ui/view/gridwin.cxx|1 
 sc/source/ui/view/gridwin2.cxx   |1 
 sc/source/ui/view/preview.cxx|1 
 sc/source/ui/view/select.cxx |1 
 sc/source/ui/view/tabcont.cxx|1 
 sc/source/ui/view/tabvwshe.cxx   |1 
 sc/source/ui/view/viewfun2.cxx   |1 
 sc/source/ui/view/viewfun6.cxx   |1 
 sc/source/ui/view/viewfunc.cxx   |1 
 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |1 
 sfx2/source/appl/app.cxx |1 
 sfx2/source/appl/appcfg.cxx  |1 
 sfx2/source/dialog/passwd.cxx|2 
 starmath/source/dialog.cxx   |1 
 svtools/source/contnr/fileview.cxx   |1 
 svtools/source/contnr/svlbitm.cxx|1 
 svtools/source/edit/textview.cxx |1 
 svx/inc/svx/galctrl.hxx  |1 
 svx/source/fmcomp/gridctrl.cxx   |1 
 svx/source/form/fmexpl.cxx   |1 
 svx/source/form/fmshell.cxx  |1 
 svx/source/form/tbxform.cxx  |1 
 svx/source/gengal/gengal.cxx |1 
 svx/workben/edittest.cxx |1 
 sw/source/core/doc/docedt.cxx|3 
 sw/source/core/layout/paintfrm.cxx   |1 
 sw/source/core/text/frmpaint.cxx |1 
 sw/source/ui/dochdl/swdtflvr.cxx |1 
 sw/source/ui/utlui/content.cxx   |1 
 sw/source/ui/wrtsh/wrtsh1.cxx|1 
 vcl/Library_vcl.mk   |1 
 vcl/Package_inc.mk   |1 
 vcl/inc/vcl/msgbox.hxx   |1 
 vcl/inc/vcl/sound.hxx|   41 ---
 vcl/source/app/dbggui.cxx|2 
 vcl/source/app/sound.cxx |   40 --
 vcl/source/control/field2.cxx|1 
 vcl/source/control/scrbar.cxx|7 -
 vcl/source/control/tabctrl.cxx   |1 
 vcl/source/window/menu.cxx   |1 
 vcl/source/window/msgbox.cxx |8 --
 vcl/source/window/syswin.cxx |4 -
 vcl/source/window/toolbox.cxx|2 
 vcl/source/window/winproc.cxx|8 --
 63 files changed, 2 insertions(+), 172 deletions(-)

New commits:
commit 0bdf6fc7c71c4c49e6d6f83d56ac953272ad16d5
Author: Mathieu Vonlanthen mat_...@fastmail.fm
Date:   Sat Jul 28 16:13:18 2012 +0200

Bug 48549 - System::Beep() removal

Change-Id: I011048912af051a762a78af8646513a1fc624073

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index 5f7fe56..1eab598 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -45,7 +45,6 @@
 #include svtools/xtextedt.hxx
 #include

[Libreoffice-commits] .: basctl/source

2012-07-26 Thread Noel Power

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

New commits:
commit 604b1bf89ced64b509122eaa8cc99dbf033438ab
Author: Uray M. JÃ¡nos uray.ja...@gmail.com
Date:   Wed Jul 25 16:06:39 2012 +0200

fixed Replace all message in Basic IDE

Change-Id: I3e4fdb07ea5a1d1d47bcf190a5ee96800b44f89b

diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index b342255..96f0b65 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -147,7 +147,7 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest rReq )
 {
 // memorize item because of the adjustments...
 BasicIDEGlobals::GetExtraData()-SetSearchItem( (const 
SvxSearchItem)rItem );
-sal_uInt16 nFound = 0;
+sal_Int32 nFound = 0;
 sal_Bool bCanceled = sal_False;
 if ( ((const SvxSearchItem)rItem).GetCommand() == 
SVX_SEARCHCMD_REPLACE_ALL )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2012-07-26 Thread Noel Power

 basctl/source/basicide/bastype2.cxx |   34 +++---
 basctl/source/basicide/bastype2.hxx |2 ++
 2 files changed, 29 insertions(+), 7 deletions(-)

New commits:
commit bb66a2c3ee9807e79ba437c770559787abe61b9b
Author: Uray M. JÃ¡nos uray.ja...@gmail.com
Date:   Tue Jul 24 19:27:25 2012 +0200

fdo#50632 IDE: update Object Catalog when closing a document

Change-Id: Ia635aee1611eaff663906e2238bf23a5013242a3

diff --git a/basctl/source/basicide/bastype2.cxx 
b/basctl/source/basicide/bastype2.cxx
index ce4d0a3..d8ccb8b 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -559,9 +559,12 @@ void BasicTreeListBox::onDocumentSaveAsDone( const 
ScriptDocument /*_rDocument*
 UpdateEntries();
 }
 
-void BasicTreeListBox::onDocumentClosed( const ScriptDocument /*_rDocument*/ )
+void BasicTreeListBox::onDocumentClosed( const ScriptDocument rDocument )
 {
 UpdateEntries();
+// The document is not yet actually deleted, so we need to remove its entry
+// manually.
+RemoveEntry(rDocument);
 }
 
 void BasicTreeListBox::onDocumentTitleChanged( const ScriptDocument 
/*_rDocument*/ )
@@ -578,7 +581,7 @@ void BasicTreeListBox::UpdateEntries()
 {
 BasicEntryDescriptor aCurDesc( GetEntryDescriptor( FirstSelected() ) );
 
-
+// removing the invalid entries
 SvLBoxEntry* pLastValid = 0;
 SvLBoxEntry* pEntry = First();
 while ( pEntry )
@@ -586,19 +589,36 @@ void BasicTreeListBox::UpdateEntries()
 if ( IsValidEntry( pEntry ) )
 pLastValid = pEntry;
 else
-{
-delete (BasicEntry*)pEntry-GetUserData();
-GetModel()-Remove( pEntry );
-}
+RemoveEntry(pEntry);
 pEntry = pLastValid ? Next( pLastValid ) : First();
 }
 
-
 ScanAllEntries();
 
 SetCurrentEntry( aCurDesc );
 }
 
+// Removes the entry from the tree.
+void BasicTreeListBox::RemoveEntry (SvLBoxEntry* pEntry)
+{
+// removing the associated user data
+delete (BasicEntry*)pEntry-GetUserData();
+// removing the entry
+GetModel()-Remove( pEntry );
+}
+
+// Removes the entry of rDocument.
+void BasicTreeListBox::RemoveEntry (ScriptDocument const rDocument)
+{
+// finding the entry of rDocument
+for (SvLBoxEntry* pEntry = First(); pEntry; pEntry = Next(pEntry))
+if (rDocument == GetEntryDescriptor(pEntry).GetDocument())
+{
+RemoveEntry(pEntry);
+break;
+}
+}
+
 SvLBoxEntry* BasicTreeListBox::CloneEntry( SvLBoxEntry* pSource )
 {
 SvLBoxEntry* pNew = SvTreeListBox::CloneEntry( pSource );
diff --git a/basctl/source/basicide/bastype2.hxx 
b/basctl/source/basicide/bastype2.hxx
index e8acb2b..efcaa4f 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -195,6 +195,8 @@ public:
 SvLBoxEntry*AddEntry( const ::rtl::OUString rText, const Image 
rImage,
   SvLBoxEntry* pParent, bool bChildrenOnDemand,
   std::auto_ptr BasicEntry  aUserData );
+voidRemoveEntry (SvLBoxEntry*);
+voidRemoveEntry (ScriptDocument const);
 
 ::rtl::OUString GetRootEntryName( const ScriptDocument rDocument, 
LibraryLocation eLocation ) const;
 voidGetRootEntryBitmaps( const ScriptDocument rDocument, 
Image rImage );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2012-07-26 Thread Takeshi Abe

 basctl/source/basicide/baside2b.cxx|8 ++--
 basctl/source/basicide/baside3.cxx |4 +-
 basctl/source/basicide/basides1.cxx|   55 ++---
 basctl/source/basicide/basides2.cxx|8 ++--
 basctl/source/basicide/basides3.cxx|6 +--
 basctl/source/basicide/basidesh.cxx|   26 ++---
 basctl/source/basicide/basobj3.cxx |   12 +++---
 basctl/source/basicide/localizationmgr.cxx |2 -
 basctl/source/inc/basidesh.hxx |6 +--
 basctl/source/inc/basobj.hxx   |2 -
 10 files changed, 65 insertions(+), 64 deletions(-)

New commits:
commit 992e5296d76b42212e6ef674bd3f4ac5cb6828d5
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Fri Jul 27 10:35:28 2012 +0900

sal_Bool - bool

Change-Id: I97618ffb138f292665edb634a29c39ab5a332ab1

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index c5b09d7..bf82724 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -266,7 +266,7 @@ String EditorWindow::GetWordAtCursor()
 
 void EditorWindow::RequestHelp( const HelpEvent rHEvt )
 {
-sal_Bool bDone = sal_False;
+bool bDone = false;
 
 // Should have been activated at some point
 if ( pEditEngine )
@@ -275,7 +275,7 @@ void EditorWindow::RequestHelp( const HelpEvent rHEvt )
 {
 String aKeyword = GetWordAtCursor();
 Application::GetHelp()-SearchKeyword( aKeyword );
-bDone = sal_True;
+bDone = true;
 }
 else if ( rHEvt.GetMode()  HELPMODE_QUICK )
 {
@@ -325,7 +325,7 @@ void EditorWindow::RequestHelp( const HelpEvent rHEvt )
 }
 }
 Help::ShowQuickHelp( this, Rectangle( aTopLeft, Size( 1, 1 ) ), 
aHelpText, QUICKHELP_TOP|QUICKHELP_LEFT);
-bDone = sal_True;
+bDone = true;
 }
 }
 
@@ -1954,7 +1954,7 @@ sal_Bool WatchTreeListBox::EditedEntry( SvLBoxEntry* 
pEntry, const rtl::OUString
 if( cFirst == '\'  cLast == '\' )
 aResult = aResult.Copy( 1, nResultLen - 2 );
 
-sal_Bool bResModified = ( aResult != aEditingRes ) ? sal_True : sal_False;
+bool bResModified = ( aResult != aEditingRes );
 sal_Bool bRet = sal_False;
 
 if ( bResModified )
diff --git a/basctl/source/basicide/baside3.cxx 
b/basctl/source/basicide/baside3.cxx
index 0cee74b..5038740 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -1199,7 +1199,7 @@ bool implImportDialog( Window* pWin, const 
::rtl::OUString rCurPath, const Scri
 {
 if ( BasicIDE::RemoveDialog( rDocument, aLibName, aNewDlgName 
) )
 {
-IDEBaseWindow* pDlgWin = pIDEShell-FindDlgWin( rDocument, 
aLibName, aNewDlgName, sal_False, sal_True );
+IDEBaseWindow* pDlgWin = pIDEShell-FindDlgWin( rDocument, 
aLibName, aNewDlgName, false, true );
 if( pDlgWin != NULL )
 pIDEShell-RemoveWindow( pDlgWin, sal_True );
 BasicIDE::MarkDocumentModified( rDocument );
@@ -1244,7 +1244,7 @@ bool implImportDialog( Window* pWin, const 
::rtl::OUString rCurPath, const Scri
 if( bSuccess )
 {
 DialogWindow* pNewDlgWin = pIDEShell-CreateDlgWin( rDocument, 
aLibName, aNewDlgName );
-pIDEShell-SetCurWindow( pNewDlgWin, sal_True );
+pIDEShell-SetCurWindow( pNewDlgWin, true );
 }
 
 bDone = true;
diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index 96f0b65..f4eb16d 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -1,3 +1,4 @@
+
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
@@ -148,7 +149,7 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest rReq )
 // memorize item because of the adjustments...
 BasicIDEGlobals::GetExtraData()-SetSearchItem( (const 
SvxSearchItem)rItem );
 sal_Int32 nFound = 0;
-sal_Bool bCanceled = sal_False;
+bool bCanceled = false;
 if ( ((const SvxSearchItem)rItem).GetCommand() == 
SVX_SEARCHCMD_REPLACE_ALL )
 {
 sal_uInt16 nActModWindows = 0;
@@ -181,7 +182,7 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest rReq )
 if ( !nFound  !((const 
SvxSearchItem)rItem).GetSelection() )
 {
 // search other modules...
-sal_Bool bChangeCurWindow = sal_False;
+bool bChangeCurWindow = false;
 for( it = aIDEWindowTable.begin(); it != 
aIDEWindowTable.end();

[Libreoffice-commits] .: basctl/source

2012-07-25 Thread Takeshi Abe

 basctl/source/basicide/baside2.cxx  |   42 ++--
 basctl/source/basicide/baside2.hxx  |   18 +++
 basctl/source/basicide/baside3.cxx  |   15 ++--
 basctl/source/basicide/basides1.cxx |4 +--
 basctl/source/inc/baside3.hxx   |4 +--
 basctl/source/inc/basidesh.hxx  |2 -
 6 files changed, 42 insertions(+), 43 deletions(-)

New commits:
commit 264ff0e6e4ed386916b6e0ad20f0fa818d53
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Tue Jul 24 17:46:32 2012 +0900

sal_Bool - bool

Change-Id: I009a55e1e399198aef8e5ad3f43230b0aea0b6fe

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index 579b706..2be8005 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -417,10 +417,10 @@ void ModulWindow::BasicStop()
 aStatus.bIsRunning = false;
 }
 
-sal_Bool ModulWindow::LoadBasic()
+bool ModulWindow::LoadBasic()
 {
 DBG_CHKTHIS( ModulWindow, 0 );
-sal_Bool bDone = sal_False;
+bool bDone = false;
 
 Reference lang::XMultiServiceFactory  xMSF( 
::comphelper::getProcessServiceFactory() );
 Reference  XFilePicker  xFP;
@@ -462,7 +462,7 @@ sal_Bool ModulWindow::LoadBasic()
 if ( nError )
 ErrorHandler::HandleError( nError );
 else
-bDone = sal_True;
+bDone = true;
 }
 else
 ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_COULDNTREAD) 
).Execute();
@@ -471,10 +471,10 @@ sal_Bool ModulWindow::LoadBasic()
 }
 
 
-sal_Bool ModulWindow::SaveBasicSource()
+bool ModulWindow::SaveBasicSource()
 {
 DBG_CHKTHIS( ModulWindow, 0 );
-sal_Bool bDone = sal_False;
+bool bDone = false;
 
 Reference lang::XMultiServiceFactory  xMSF( 
::comphelper::getProcessServiceFactory() );
 Reference  XFilePicker  xFP;
@@ -517,7 +517,7 @@ sal_Bool ModulWindow::SaveBasicSource()
 if ( nError )
 ErrorHandler::HandleError( nError );
 else
-bDone = sal_True;
+bDone = true;
 }
 else
 ErrorBox( this, WB_OK | WB_DEF_OK, String( IDEResId( 
RID_STR_COULDNTWRITE) ) ).Execute();
@@ -526,27 +526,27 @@ sal_Bool ModulWindow::SaveBasicSource()
 return bDone;
 }
 
-sal_Bool implImportDialog( Window* pWin, const ::rtl::OUString rCurPath, 
const ScriptDocument rDocument, const ::rtl::OUString aLibName );
+bool implImportDialog( Window* pWin, const ::rtl::OUString rCurPath, const 
ScriptDocument rDocument, const ::rtl::OUString aLibName );
 
-sal_Bool ModulWindow::ImportDialog()
+bool ModulWindow::ImportDialog()
 {
 const ScriptDocument rDocument = GetDocument();
 ::rtl::OUString aLibName = GetLibName();
 return implImportDialog( this, aCurPath, rDocument, aLibName );
 }
 
-sal_Bool ModulWindow::ToggleBreakPoint( sal_uLong nLine )
+bool ModulWindow::ToggleBreakPoint( sal_uLong nLine )
 {
 DBG_ASSERT( XModule().Is(), Kein Modul! );
 
-sal_Bool bNewBreakPoint = sal_False;
+bool bNewBreakPoint = false;
 
 if ( XModule().Is() )
 {
 CheckCompileBasic();
 if ( aStatus.bError )
 {
-return sal_False;
+return false;
 }
 
 BreakPoint* pBrk = GetBreakPoints().FindBreakPoint( nLine );
@@ -560,7 +560,7 @@ sal_Bool ModulWindow::ToggleBreakPoint( sal_uLong nLine )
 if ( xModule-SetBP( (sal_uInt16)nLine) )
 {
 GetBreakPoints().InsertSorted( new BreakPoint( nLine ) );
-bNewBreakPoint = sal_True;
+bNewBreakPoint = true;
 if ( StarBASIC::IsRunning() )
 {
 for ( sal_uInt16 nMethod = 0; nMethod  
xModule-GetMethods()-Count(); nMethod++ )
@@ -593,7 +593,7 @@ void ModulWindow::UpdateBreakPoint( const BreakPoint rBrk )
 }
 
 
-sal_Bool ModulWindow::BasicToggleBreakPoint()
+bool ModulWindow::BasicToggleBreakPoint()
 {
 DBG_CHKTHIS( ModulWindow, 0 );
 AssertValidEditEngine();
@@ -602,12 +602,12 @@ sal_Bool ModulWindow::BasicToggleBreakPoint()
 aSel.GetStart().GetPara()++;// Basic lines start at 1!
 aSel.GetEnd().GetPara()++;
 
-sal_Bool bNewBreakPoint = sal_False;
+bool bNewBreakPoint = false;
 
 for ( sal_uLong nLine = aSel.GetStart().GetPara(); nLine = 
aSel.GetEnd().GetPara(); nLine++ )
 {
 if ( ToggleBreakPoint( nLine ) )
-bNewBreakPoint = sal_True;
+bNewBreakPoint = true;
 }
 
 aXEditorWindow.GetBrkWindow().Invalidate();
@@ -1184,7 +1184,7 @@ void ModulWindow::FrameWindowMoved()
 
 
 
-void ModulWindow::ShowCursor( sal_Bool bOn )
+void ModulWindow::ShowCursor( bool bOn )
 {
 if ( GetEditEngine() )
 {
@@ -1217,7 +1217,7 @@ void ModulWindow::Deactivating()
 GetEditView()-EraseVirtualDevice();
 }
 
-sal_uInt16 ModulWindow::StartSearchAndReplace( const SvxSearchItem 
rSearchItem, sal_Bool

[Libreoffice-commits] .: basctl/source

2012-07-25 Thread Noel Power

 basctl/source/basicide/basides1.cxx |1 +
 basctl/source/basicide/basidesh.cxx |6 +-
 basctl/source/basicide/objdlg.cxx   |7 +--
 basctl/source/basicide/objdlg.hxx   |2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 44e8b1c8ad917d3c4ed7efe9169e5197801198f2
Author: Uray M. JÃ¡nos uray.ja...@gmail.com
Date:   Tue Jul 24 11:29:57 2012 +0200

fdo#50633 IDE: select current module in Object Catalog on open

Change-Id: Ieea731b0ed8eefdab616ed1f778b445aae14191c

diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index 0f5d524..b342255 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -1205,6 +1205,7 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, 
sal_Bool bUpdateTabBar
 GetViewFrame()-GetWindow().SetHelpId( HID_BASICIDE_MODULWINDOW );
 SfxObjectShell::SetCurrentComponent( NULL );
 }
+pModulLayout-GetObjectCatalog().SetCurrentEntry(pCurWin);
 SetUndoManager( pCurWin ? pCurWin-GetUndoManager() : 0 );
 InvalidateBasicIDESlots();
 EnableScrollbars( pCurWin ? sal_True : sal_False );
diff --git a/basctl/source/basicide/basidesh.cxx 
b/basctl/source/basicide/basidesh.cxx
index c51cb0a..e2a0884 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -542,11 +542,7 @@ void BasicIDEShell::ShowObjectDialog( sal_Bool bShow, 
sal_Bool bCreateOrDestroy
 if ( pObjectCatalog )
 {
 pObjectCatalog-SetCancelHdl( LINK( this, BasicIDEShell, 
ObjectDialogCancelHdl ) );
-BasicEntryDescriptor aDesc;
-IDEBaseWindow* pCurWin_ = GetCurWindow();
-if ( pCurWin_ )
-aDesc = pCurWin_-CreateEntryDescriptor();
-pObjectCatalog-SetCurrentEntry( aDesc );
+pObjectCatalog-SetCurrentEntry(pCurWin);
 }
 }
 
diff --git a/basctl/source/basicide/objdlg.cxx 
b/basctl/source/basicide/objdlg.cxx
index 1043594..64935bb 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -223,9 +223,12 @@ void ObjectCatalog::UpdateEntries()
 aMacroTreeList.UpdateEntries();
 }
 
-void ObjectCatalog::SetCurrentEntry( BasicEntryDescriptor rDesc )
+void ObjectCatalog::SetCurrentEntry (IDEBaseWindow* pCurWin)
 {
-aMacroTreeList.SetCurrentEntry( rDesc );
+BasicEntryDescriptor aDesc;
+if (pCurWin)
+aDesc = pCurWin-CreateEntryDescriptor();
+aMacroTreeList.SetCurrentEntry(aDesc);
 }
 
 ObjectCatalogToolBox_Impl::ObjectCatalogToolBox_Impl(
diff --git a/basctl/source/basicide/objdlg.hxx 
b/basctl/source/basicide/objdlg.hxx
index c0c3c45..f82ae0e 100644
--- a/basctl/source/basicide/objdlg.hxx
+++ b/basctl/source/basicide/objdlg.hxx
@@ -64,7 +64,7 @@ public:
 virtual ~ObjectCatalog();
 
 voidUpdateEntries();
-voidSetCurrentEntry( BasicEntryDescriptor rDesc );
+voidSetCurrentEntry (IDEBaseWindow* pCurWin);
 voidSetCancelHdl( const Link rLink ) { aCancelHdl = 
rLink; }
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2012-07-24 Thread Ivan Timofeev

 basctl/source/basicide/baside2.cxx  |   28 +---
 basctl/source/basicide/baside2.hxx  |2 ++
 basctl/source/basicide/basides1.cxx |   23 ---
 basctl/source/basicide/basidesh.cxx |2 --
 basctl/source/inc/basidesh.hxx  |2 --
 5 files changed, 27 insertions(+), 30 deletions(-)

New commits:
commit c55a4639d27957ee96c59269d894d169fa2b7b34
Author: Uray M. JÃ¡nos uray.ja...@gmail.com
Date:   Mon Jul 23 18:48:47 2012 +0200

fdo#52223 fix Object Catalog in Basic IDE when resizing

Change-Id: I96861bfcf7c0da6dd94c50acd673dedb14d15204

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index dc0f182..579b706 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1492,14 +1492,14 @@ void ModulWindowLayout::ArrangeWindows()
 if ( ( nVSplitPos  nMinPos ) || ( nVSplitPos  nMaxPos ) )
 nVSplitPos = ( nVSplitPos  nMinPos ) ? 0 : ( aSz.Height() - 
SPLIT_HEIGHT );
 
-Size aXEWSz;
-aXEWSz.Width() = aSz.Width() - OBJCAT_PANE_WIDTH;
-
-aXEWSz.Height() = nVSplitPos + 1;
 if ( m_pModulWindow )
 {
 DBG_CHKOBJ( m_pModulWindow, ModulWindow, 0 );
-m_pModulWindow-SetPosSizePixel( Point( OBJCAT_PANE_WIDTH, 0 ), aXEWSz 
);
+bool const bObjCat = aObjectCatalog.IsVisible();
+m_pModulWindow-SetPosSizePixel(
+Point(bObjCat ? OBJCAT_PANE_WIDTH : 0, 0),
+Size(bObjCat ? aSz.Width() - OBJCAT_PANE_WIDTH : aSz.Width(), 
nVSplitPos + 1)
+);
 }
 
 aVSplitter.SetDragRectPixel( Rectangle( Point( 0, 0 ), Size( aSz.Width(), 
aSz.Height() ) ) );
@@ -1524,10 +1524,12 @@ void ModulWindowLayout::ArrangeWindows()
 if ( !aStackWindow.IsFloatingMode() )
 aStackWindow.SetPosSizePixel( aSWPos, aSWSz );
 
-Size aOCSz( OBJCAT_PANE_WIDTH, aSz.Height() - aSWSz.Height() - 3 );
-Point aOCPos( 0, 0 );
 if ( !aObjectCatalog.IsFloatingMode() )
+{
+Size aOCSz( OBJCAT_PANE_WIDTH, aSz.Height() - aSWSz.Height() - 3 );
+Point aOCPos( 0, 0 );
 aObjectCatalog.SetPosSizePixel( aOCPos, aOCSz );
+}
 
 if ( aStackWindow.IsFloatingMode()  aWatchWindow.IsFloatingMode() )
 aHSplitter.Hide();
@@ -1717,4 +1719,16 @@ Image ModulWindowLayout::getImage(sal_uInt16 nId) const
 return m_aImagesNormal.GetImage(nId);
 }
 
+// shows or hides the Object Catalog window (depending on its state)
+void ModulWindowLayout::ToggleObjectCatalog ()
+{
+// show or hide?
+bool const bShow = !aObjectCatalog.IsVisible();
+bShow ? aObjectCatalog.Show() : aObjectCatalog.Hide();
+if (m_pModulWindow)
+m_pModulWindow-SetObjectCatalogDisplay(bShow);
+// refreshing
+ArrangeWindows();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/baside2.hxx 
b/basctl/source/basicide/baside2.hxx
index 5e3a06c..e8f0cb6 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -477,6 +477,8 @@ public:
 
 inline Color const  getSyntaxColor(TokenTypes eType) const
 { return m_aSyntaxColors[eType]; }
+
+void ToggleObjectCatalog ();
 };
 
 #endif  // _BASIDE2_HXX
diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index d11ece3..ae9443f 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -439,26 +439,11 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest rReq )
 pWin-EditMacro( rInfo.GetMethod() );
 }
 break;
+
 case SID_BASICIDE_OBJCAT:
-{
-if ( bObjectCatalogDisplay )
-{
-pModulLayout-GetObjectCatalog().Hide();
-dynamic_castModulWindow*(pCurWin)-SetPosPixel( Point( 0, 0 
) );
-dynamic_castModulWindow*(pCurWin)-SetSizePixel( Size( 
pCurWin-GetSizePixel().Width() + OBJCAT_PANE_WIDTH, 
pCurWin-GetSizePixel().Height() ) );
-dynamic_castModulWindow*(pCurWin)-SetObjectCatalogDisplay( 
false );
-bObjectCatalogDisplay = sal_False;
-}
-else
-{
-pModulLayout-GetObjectCatalog().Show();
-dynamic_castModulWindow*(pCurWin)-SetPosPixel( Point( 
OBJCAT_PANE_WIDTH, 0 ) );
-dynamic_castModulWindow*(pCurWin)-SetSizePixel( Size( 
pCurWin-GetSizePixel().Width() - OBJCAT_PANE_WIDTH, 
pCurWin-GetSizePixel().Height() ) );
-dynamic_castModulWindow*(pCurWin)-SetObjectCatalogDisplay( 
true );
-bObjectCatalogDisplay = sal_True;
-}
-}
-break;
+pModulLayout-ToggleObjectCatalog();
+break;
+
 case SID_BASICIDE_NAMECHANGEDONTAB:
 {
 DBG_ASSERT( rReq.GetArgs(), arguments expected );
diff --git a/basctl/source/basicide/basidesh.cxx 
b/basctl/source/basicide/basidesh.cxx
index b6cad4c..c51cb0a 100644
---

[Libreoffice-commits] .: basctl/source

2012-07-23 Thread Takeshi Abe

 basctl/source/basicide/baside2.cxx  |4 ++--
 basctl/source/basicide/baside2.hxx  |2 +-
 basctl/source/basicide/baside2b.cxx |4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 7727f93d7dca7ebffc7bcf3ef82cbefca8599eee
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Mon Jul 23 19:00:41 2012 +0900

Remove unused argument

Change-Id: Ida75dce28b876abf4aec8dcae8ad60ba89063b59

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index 696d603..dc0f182 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -268,7 +268,7 @@ void ModulWindow::CheckCompileBasic()
 if( bModified )
 {
 AssertValidEditEngine();
-GetEditorWindow().SetSourceInBasic( false );
+GetEditorWindow().SetSourceInBasic();
 }
 
 sal_Bool bWasModified = GetBasic()-IsModified();
@@ -836,7 +836,7 @@ void ModulWindow::StoreData()
 // StoreData is called when the BasicManager is destroyed or
 // this window is closed.
 // = interrupts undesired!
-GetEditorWindow().SetSourceInBasic( true );
+GetEditorWindow().SetSourceInBasic();
 }
 
 bool ModulWindow::CanClose()
diff --git a/basctl/source/basicide/baside2.hxx 
b/basctl/source/basicide/baside2.hxx
index 7a15c45..5e3a06c 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -161,7 +161,7 @@ public:
 { pModulWindow = pWin; }
 
 voidForceSyntaxTimeout();
-boolSetSourceInBasic( bool bQuiet = true );
+boolSetSourceInBasic();
 
 boolCanModify() { return ImpCanModify(); }
 };
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 4fbd360..c5b09d7 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -500,10 +500,8 @@ void EditorWindow::LoseFocus()
 Window::LoseFocus();
 }
 
-bool EditorWindow::SetSourceInBasic( bool bQuiet )
+bool EditorWindow::SetSourceInBasic()
 {
-(void)bQuiet;
-
 bool bChanged = false;
 if ( pEditEngine  pEditEngine-IsModified()
  !GetEditView()-IsReadOnly() )   // Added for #i60626, otherwise
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2012-07-19 Thread Takeshi Abe

 basctl/source/basicide/basicbox.cxx |   16 -
 basctl/source/basicide/basicbox.hxx |4 +-
 basctl/source/basicide/baside2.cxx  |   50 +++
 basctl/source/basicide/baside2.hxx  |   38 +++
 basctl/source/basicide/baside2b.cxx |   58 ++--
 basctl/source/basicide/bastypes.cxx |8 ++--
 basctl/source/inc/bastypes.hxx  |4 +-
 7 files changed, 89 insertions(+), 89 deletions(-)

New commits:
commit 390fc89057e5cf8a701846836740be09fd8e850e
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Fri Jul 20 06:11:34 2012 +0900

sal_Bool - bool

Change-Id: I5b334344a0ead5fde083c952e625d74978f1a927

diff --git a/basctl/source/basicide/basicbox.cxx 
b/basctl/source/basicide/basicbox.cxx
index 600f6bb..81b2f9d 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -152,12 +152,12 @@ BasicLibBox::BasicLibBox( Window* pParent, const 
uno::Reference frame::XFrame 
 m_xFrame( rFrame )
 {
 FillBox();
-bIgnoreSelect = sal_True;   // do not yet transfer select of 0
-bFillBox = sal_True;
+bIgnoreSelect = true;   // do not yet transfer select of 0
+bFillBox = true;
 SelectEntryPos( 0 );
 aCurText = GetEntry( 0 );
 SetSizePixel( Size( 250, 200 ) );
-bIgnoreSelect = sal_False;
+bIgnoreSelect = false;
 }
 
 
@@ -202,7 +202,7 @@ void BasicLibBox::ReleaseFocus()
 void BasicLibBox::FillBox()
 {
 SetUpdateMode( sal_False );
-bIgnoreSelect = sal_True;
+bIgnoreSelect = true;
 
 aCurText = GetSelectEntry();
 
@@ -232,7 +232,7 @@ void BasicLibBox::FillBox()
 SelectEntryPos( GetEntryCount() );
 aCurText = GetSelectEntry();
 }
-bIgnoreSelect = sal_False;
+bIgnoreSelect = false;
 }
 
 void BasicLibBox::InsertEntries( const ScriptDocument rDocument, 
LibraryLocation eLocation )
@@ -285,15 +285,15 @@ long BasicLibBox::PreNotify( NotifyEvent rNEvt )
 if ( bFillBox )
 {
 FillBox();
-bFillBox = sal_False;
+bFillBox = false;
 }
 }
 else if( rNEvt.GetType() == EVENT_LOSEFOCUS )
 {
 if ( !HasChildPathFocus( sal_True ) )
 {
-bIgnoreSelect = sal_True;
-bFillBox = sal_True;
+bIgnoreSelect = true;
+bFillBox = true;
 }
 }
 
diff --git a/basctl/source/basicide/basicbox.hxx 
b/basctl/source/basicide/basicbox.hxx
index 314d99d..ce55433 100644
--- a/basctl/source/basicide/basicbox.hxx
+++ b/basctl/source/basicide/basicbox.hxx
@@ -75,8 +75,8 @@ class BasicLibBox : public DocListenerBox
 {
 private:
 String  aCurText;
-sal_BoolbIgnoreSelect;
-sal_BoolbFillBox;
+boolbIgnoreSelect;
+boolbFillBox;
 com::sun::star::uno::Reference ::com::sun::star::frame::XFrame  m_xFrame;
 
 voidReleaseFocus();
diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index e419c42..d427a30 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -268,7 +268,7 @@ void ModulWindow::CheckCompileBasic()
 if( bModified )
 {
 AssertValidEditEngine();
-GetEditorWindow().SetSourceInBasic( sal_False );
+GetEditorWindow().SetSourceInBasic( false );
 }
 
 sal_Bool bWasModified = GetBasic()-IsModified();
@@ -285,12 +285,12 @@ void ModulWindow::CheckCompileBasic()
 pIDEShell-GetViewFrame()-GetWindow().LeaveWait();
 
 aStatus.bError = !bDone;
-aStatus.bIsRunning = sal_False;
+aStatus.bIsRunning = false;
 }
 }
 }
 
-sal_Bool ModulWindow::BasicExecute()
+bool ModulWindow::BasicExecute()
 {
 DBG_CHKTHIS( ModulWindow, 0 );
 
@@ -301,7 +301,7 @@ sal_Bool ModulWindow::BasicExecute()
 if ( !aDocument.allowMacros() )
 {
 WarningBox( this, WB_OK, 
IDE_RESSTR(RID_STR_CANNOTRUNMACRO)).Execute();
-return sal_False;
+return false;
 }
 }
 
@@ -351,10 +351,10 @@ sal_Bool ModulWindow::BasicExecute()
 ClearStatus( BASWIN_RUNNINGBASIC );
 }
 else
-aStatus.bIsRunning = sal_False; // cancel of Reschedule()
+aStatus.bIsRunning = false; // cancel of Reschedule()
 }
 
-sal_Bool bDone = !aStatus.bError;
+bool bDone = !aStatus.bError;
 
 return bDone;
 }
@@ -371,39 +371,39 @@ sal_Bool ModulWindow::CompileBasic()
 return bIsCompiled;
 }
 
-sal_Bool ModulWindow::BasicRun()
+bool ModulWindow::BasicRun()
 {
 DBG_CHKTHIS( ModulWindow, 0 );
 
 aStatus.nBasicFlags = 0;
-sal_Bool bDone = BasicExecute();
+bool bDone = BasicExecute();
 return bDone;
 }
 
-sal_Bool ModulWindow::BasicStepOver()
+bool ModulWindow::BasicStepOver()
 {
 DBG_CHKTHIS( ModulWindow, 0 );
 aStatus.nBasicFlags =

[Libreoffice-commits] .: basctl/source configmgr/source fpicker/source linguistic/source svl/source xml2cmp/source xmlsecurity/source

2012-06-19 Thread Takeshi Abe

 basctl/source/basicide/bastype2.hxx   |3 ---
 basctl/source/basicide/bastype3.hxx   |2 --
 basctl/source/basicide/macrodlg.hxx   |2 --
 basctl/source/basicide/moduldlg.hxx   |2 --
 basctl/source/basicide/objdlg.hxx |2 --
 configmgr/source/access.hxx   |1 -
 configmgr/source/broadcaster.hxx  |2 --
 configmgr/source/localizedpropertynode.hxx|3 ---
 fpicker/source/office/PlaceEditDialog.hxx |1 -
 fpicker/source/office/ServerDetailsControls.hxx   |2 --
 fpicker/source/office/commonpicker.hxx|5 -
 fpicker/source/office/iodlg.hxx   |2 --
 fpicker/source/office/iodlgimp.hxx|1 -
 linguistic/source/convdic.hxx |2 --
 linguistic/source/lngopt.hxx  |3 ---
 linguistic/source/lngsvcmgr.hxx   |1 -
 svl/source/inc/poolio.hxx |2 --
 svl/source/numbers/numfmuno.hxx   |2 --
 xml2cmp/source/xcd/xmlelem.hxx|1 -
 xmlsecurity/source/helper/xmlsignaturehelper2.hxx |2 --
 20 files changed, 41 deletions(-)

New commits:
commit eeb5bea1d4e41ac190283d3b7d90659acbce5065
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Wed Jun 20 00:50:17 2012 +0900

removed unused forward declarations of class

Change-Id: Iee1b78242e210466375376da3e4dbbaec609cc03

diff --git a/basctl/source/basicide/bastype2.hxx 
b/basctl/source/basicide/bastype2.hxx
index 39a13ca..bf60e29 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -37,12 +37,9 @@ enum BasicEntryType { OBJ_TYPE_UNKNOWN, OBJ_TYPE_DOCUMENT, 
OBJ_TYPE_LIBRARY, OBJ
 #define BROWSEMODE_SUBS 0x02
 #define BROWSEMODE_DIALOGS  0x04
 
-class SbMethod;
-class SbxObject;
 class SbModule;
 class SvLBoxEntry;
 class SbxVariable;
-class String;
 
 
 class BasicEntry
diff --git a/basctl/source/basicide/bastype3.hxx 
b/basctl/source/basicide/bastype3.hxx
index bd86e93..b222828 100644
--- a/basctl/source/basicide/bastype3.hxx
+++ b/basctl/source/basicide/bastype3.hxx
@@ -25,8 +25,6 @@
 
 #include iderid.hxx
 
-class EditorWindow;
-
 #ifndef NO_SPECIALEDIT
 
 class ExtendedEdit : public Edit
diff --git a/basctl/source/basicide/macrodlg.hxx 
b/basctl/source/basicide/macrodlg.hxx
index fbfb396..e572849 100644
--- a/basctl/source/basicide/macrodlg.hxx
+++ b/basctl/source/basicide/macrodlg.hxx
@@ -38,8 +38,6 @@
 #define MACROCHOOSER_CHOOSEONLY 2
 #define MACROCHOOSER_RECORDING  3
 
-class BasicManager;
-
 class MacroChooser : public SfxModalDialog
 {
 private:
diff --git a/basctl/source/basicide/moduldlg.hxx 
b/basctl/source/basicide/moduldlg.hxx
index 026591e..2132967 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -35,8 +35,6 @@
 #include vcl/tabctrl.hxx
 #include vcl/lstbox.hxx
 
-class StarBASIC;
-
 enum NewObjectMode
 {
 NEWOBJECTMODE_LIB  = 1,
diff --git a/basctl/source/basicide/objdlg.hxx 
b/basctl/source/basicide/objdlg.hxx
index 05fc871..c0c3c45 100644
--- a/basctl/source/basicide/objdlg.hxx
+++ b/basctl/source/basicide/objdlg.hxx
@@ -28,8 +28,6 @@
 
 #include bastype2.hxx
 
-class StarBASIC;
-
 class ObjectCatalogToolBox_Impl: public ToolBox
 {
 public:
diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx
index c1c8bf5..1e91fed 100644
--- a/configmgr/source/access.hxx
+++ b/configmgr/source/access.hxx
@@ -87,7 +87,6 @@ namespace rtl { class OUString; }
 namespace configmgr {
 
 class Broadcaster;
-class Change;
 class ChildAccess;
 class Components;
 class Node;
diff --git a/configmgr/source/broadcaster.hxx b/configmgr/source/broadcaster.hxx
index a763303..80fb1db 100644
--- a/configmgr/source/broadcaster.hxx
+++ b/configmgr/source/broadcaster.hxx
@@ -44,8 +44,6 @@ namespace com { namespace sun { namespace star {
 
 namespace configmgr {
 
-class Access;
-
 class Broadcaster: private boost::noncopyable {
 public:
 void addDisposeNotification(
diff --git a/configmgr/source/localizedpropertynode.hxx 
b/configmgr/source/localizedpropertynode.hxx
index fb7742c..8fe6c8e 100644
--- a/configmgr/source/localizedpropertynode.hxx
+++ b/configmgr/source/localizedpropertynode.hxx
@@ -28,9 +28,6 @@
 #include nodemap.hxx
 #include type.hxx
 
-namespace com { namespace sun { namespace star { namespace uno {
-class Any;
-} } } }
 namespace rtl { class OUString; }
 
 namespace configmgr {
diff --git a/fpicker/source/office/PlaceEditDialog.hxx 
b/fpicker/source/office/PlaceEditDialog.hxx
index 53526e8..fd38f13 100644
--- a/fpicker/source/office/PlaceEditDialog.hxx
+++ b/fpicker/source/office/PlaceEditDialog.hxx
@@ -43,7 +43,6 @@
 #include boost/shared_ptr.hpp
 #include vector
 
-class Place;
 class PlaceEditDialog : public ModalDialog
 {
 private :
diff --git a/fpicker/source/office/ServerDetailsControls.hxx

[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

86 matches

Mail list logo