[Libreoffice-commits] core.git: comphelper/inc comphelper/source

2015-11-08 Thread Mario J . Rugiero 
 comphelper/inc/pch/precompiled_comphelper.hxx |1 -
 comphelper/source/property/property.cxx   |1 -
 2 files changed, 2 deletions(-)

New commits:
commit 960d03211e471bd5f6d3dd33ae929dfe43d47402
Author: Mario J. Rugiero 
Date:   Sun Nov 8 19:14:26 2015 -0300

Cleanup two unused boost/bind includes in comphelper.

Change-Id: I8bfbbc82be3a91d7227ff76fc6eb570c1155dd4f
Reviewed-on: https://gerrit.libreoffice.org/19844
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/comphelper/inc/pch/precompiled_comphelper.hxx 
b/comphelper/inc/pch/precompiled_comphelper.hxx
index cfc8055..d83ade8 100644
--- a/comphelper/inc/pch/precompiled_comphelper.hxx
+++ b/comphelper/inc/pch/precompiled_comphelper.hxx
@@ -16,7 +16,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/comphelper/source/property/property.cxx 
b/comphelper/source/property/property.cxx
index f22561c..bcf7609 100644
--- a/comphelper/source/property/property.cxx
+++ b/comphelper/source/property/property.cxx
@@ -34,7 +34,6 @@
 #include 
 
 #include 
-#include 
 
 
 namespace comphelper
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: comphelper/inc comphelper/source dbaccess/source desktop/source dtrans/source embeddedobj/source embeddedobj/test forms/source fpicker/source

2013-04-05 Thread Ashish Banerjee 
 comphelper/inc/comphelper/property.hxx   |6 +++---
 comphelper/source/misc/ihwrapnofilter.cxx|2 +-
 comphelper/source/misc/instancelocker.cxx|2 +-
 dbaccess/source/ui/dlg/CollectionView.cxx|2 +-
 desktop/source/deployment/manager/dp_informationprovider.cxx |2 +-
 dtrans/source/cnttype/mcnttfactory.cxx   |2 +-
 dtrans/source/generic/clipboardmanager.cxx   |4 ++--
 dtrans/source/generic/generic_clipboard.cxx  |2 +-
 dtrans/source/win32/clipb/WinClipboard.cxx   |2 +-
 dtrans/source/win32/ftransl/ftransl.cxx  |2 +-
 embeddedobj/source/commonembedding/xfactory.cxx  |4 ++--
 embeddedobj/source/general/xcreator.cxx  |2 +-
 embeddedobj/source/msole/xdialogcreator.cxx  |2 +-
 embeddedobj/source/msole/xolefactory.cxx |2 +-
 embeddedobj/test/MainThreadExecutor/xexecutor.cxx|2 +-
 embeddedobj/test/mtexecutor/bitmapcreator.cxx|2 +-
 embeddedobj/test/mtexecutor/mainthreadexecutor.cxx   |2 +-
 forms/source/component/Edit.cxx  |2 +-
 fpicker/source/aqua/SalAquaFilePicker.mm |2 +-
 fpicker/source/aqua/SalAquaFolderPicker.mm   |2 +-
 fpicker/source/win32/filepicker/FilePicker.cxx   |2 +-
 fpicker/source/win32/filepicker/VistaFilePicker.cxx  |2 +-
 fpicker/source/win32/folderpicker/FolderPicker.cxx   |2 +-
 23 files changed, 27 insertions(+), 27 deletions(-)

New commits:
commit e1f6dac6893e0ad9e1b1f03a3b882cf1e9a08d32
Author: Ashish Banerjee ashish.banerje...@gmail.com
Date:   Wed Apr 3 20:11:54 2013 -0600

Replace `compareTo(...) == 0` with ==

Proposed patch for the following issue:
https://bugs.freedesktop.org/show_bug.cgi?id=62096

Change-Id: Ib83a9051ea12c53642f781e5427a6ca728049a7f
Reviewed-on: https://gerrit.libreoffice.org/3198
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Reviewed-by: Luboš Luňák l.lu...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/comphelper/inc/comphelper/property.hxx 
b/comphelper/inc/comphelper/property.hxx
index d8e0d3b..29ff7b2 100644
--- a/comphelper/inc/comphelper/property.hxx
+++ b/comphelper/inc/comphelper/property.hxx
@@ -60,12 +60,12 @@ namespace comphelper
 // 
 inline bool operator()( const ::com::sun::star::beans::Property lhs, 
const ::rtl::OUString rhs ) const
 {
-return lhs.Name.compareTo(rhs) == 0;
+return lhs.Name == rhs ;
 }
 // 
 inline bool operator()( const ::rtl::OUString lhs, const 
::com::sun::star::beans::Property rhs ) const
 {
-return lhs.compareTo(rhs.Name) == 0;
+return lhs == rhs.Name ;
 }
 };
 
//--
@@ -74,7 +74,7 @@ namespace comphelper
 {
 bool operator() (const ::com::sun::star::beans::Property x, const 
::com::sun::star::beans::Property y) const
 {
-return x.Name.compareTo(y.Name) == 0;
+return x.Name == y.Name ;
 }
 };
 
diff --git a/comphelper/source/misc/ihwrapnofilter.cxx 
b/comphelper/source/misc/ihwrapnofilter.cxx
index 150da2b..c6b6697 100644
--- a/comphelper/source/misc/ihwrapnofilter.cxx
+++ b/comphelper/source/misc/ihwrapnofilter.cxx
@@ -114,7 +114,7 @@ namespace comphelper
 uno::Sequence ::rtl::OUString  aSeq = 
impl_staticGetSupportedServiceNames();
 
 for ( sal_Int32 nInd = 0; nInd  aSeq.getLength(); nInd++ )
-if ( ServiceName.compareTo( aSeq[nInd] ) == 0 )
+if ( ServiceName == aSeq[nInd] )
 return sal_True;
 
 return sal_False;
diff --git a/comphelper/source/misc/instancelocker.cxx 
b/comphelper/source/misc/instancelocker.cxx
index 50ca694..a42852f 100644
--- a/comphelper/source/misc/instancelocker.cxx
+++ b/comphelper/source/misc/instancelocker.cxx
@@ -203,7 +203,7 @@ void SAL_CALL OInstanceLocker::initialize( const 
uno::Sequence uno::Any  aArg
 uno::Sequence ::rtl::OUString  aSeq = getSupportedServiceNames();
 
 for ( sal_Int32 nInd = 0; nInd  aSeq.getLength(); nInd++ )
-if ( ServiceName.compareTo( aSeq[nInd] ) == 0 )
+if ( ServiceName == aSeq[nInd] )
 return sal_True;
 
 return sal_False;
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx 
b/dbaccess/source/ui/dlg/CollectionView.cxx
index 40516da..202c54f 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -287,7 +287,7 @@ void

[Libreoffice-commits] core.git: comphelper/inc comphelper/source

2013-03-28 Thread Stephan Bergmann 
 comphelper/inc/comphelper/proxyaggregation.hxx |4 +---
 comphelper/source/misc/accessiblewrapper.cxx   |2 +-
 comphelper/source/misc/proxyaggregation.cxx|8 
 3 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit 048e64e71fad3187d2165ed6eb0a42fdcd6e0caa
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Mar 28 15:35:05 2013 +0100

Drop redundant typedef

Change-Id: I13f1858babb1fb2b4120bcbf0e2e04a2a1f4bf88

diff --git a/comphelper/inc/comphelper/proxyaggregation.hxx 
b/comphelper/inc/comphelper/proxyaggregation.hxx
index 2d78b86..2c01a7a 100644
--- a/comphelper/inc/comphelper/proxyaggregation.hxx
+++ b/comphelper/inc/comphelper/proxyaggregation.hxx
@@ -175,10 +175,8 @@ namespace comphelper
 //=
 //= OComponentProxyAggregation
 //=
-typedef ::cppu::WeakComponentImplHelperBase 
OComponentProxyAggregation_CBase;
-
 class COMPHELPER_DLLPUBLIC OComponentProxyAggregation   :public OBaseMutex
-,public 
OComponentProxyAggregation_CBase
+,public 
cppu::WeakComponentImplHelperBase
 ,public 
OComponentProxyAggregationHelper
 {
 protected:
diff --git a/comphelper/source/misc/accessiblewrapper.cxx 
b/comphelper/source/misc/accessiblewrapper.cxx
index 897f0fd..4996cb2 100644
--- a/comphelper/source/misc/accessiblewrapper.cxx
+++ b/comphelper/source/misc/accessiblewrapper.cxx
@@ -663,7 +663,7 @@ namespace comphelper
 void SAL_CALL OAccessibleContextWrapper::dispose() throw( RuntimeException 
)
 {
 // simply disambiguate
-OComponentProxyAggregation_CBase::dispose();
+WeakComponentImplHelperBase::dispose();
 }
 
 //.
diff --git a/comphelper/source/misc/proxyaggregation.cxx 
b/comphelper/source/misc/proxyaggregation.cxx
index 9a19cf5..86d0082 100644
--- a/comphelper/source/misc/proxyaggregation.cxx
+++ b/comphelper/source/misc/proxyaggregation.cxx
@@ -191,7 +191,7 @@ namespace comphelper
 //-
 OComponentProxyAggregation::OComponentProxyAggregation( const Reference 
XComponentContext  _rxContext,
 const Reference XComponent  _rxComponent )
-:OComponentProxyAggregation_CBase( m_aMutex )
+:WeakComponentImplHelperBase( m_aMutex )
 ,OComponentProxyAggregationHelper( _rxContext, rBHelper )
 {
 OSL_ENSURE( _rxComponent.is(), 
OComponentProxyAggregation::OComponentProxyAggregation: accessible is no 
XComponent! );
@@ -206,7 +206,7 @@ namespace comphelper
 }
 
 //-
-IMPLEMENT_FORWARD_XINTERFACE2( OComponentProxyAggregation, 
OComponentProxyAggregation_CBase, OComponentProxyAggregationHelper )
+IMPLEMENT_FORWARD_XINTERFACE2( OComponentProxyAggregation, 
WeakComponentImplHelperBase, OComponentProxyAggregationHelper )
 
 //-
 IMPLEMENT_GET_IMPLEMENTATION_ID( OComponentProxyAggregation )
@@ -216,7 +216,7 @@ namespace comphelper
 {
 Sequence Type  aTypes( OComponentProxyAggregationHelper::getTypes() 
);
 
-// append XComponent, coming from OComponentProxyAggregation_CBase
+// append XComponent, coming from WeakComponentImplHelperBase
 sal_Int32 nLen = aTypes.getLength();
 aTypes.realloc( nLen + 1 );
 aTypes[ nLen ] = ::getCppuType( static_cast Reference XComponent * 
( NULL ) );
@@ -256,7 +256,7 @@ namespace comphelper
 void SAL_CALL OComponentProxyAggregation::dispose() throw( 
RuntimeException )
 {
 // simply disambiguate
-OComponentProxyAggregation_CBase::dispose();
+WeakComponentImplHelperBase::dispose();
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: comphelper/inc comphelper/source dbaccess/source

2013-03-02 Thread Gábor Nyers 
 comphelper/inc/comphelper/syntaxhighlight.hxx  |   37 +
 comphelper/source/misc/syntaxhighlight.cxx |7 +-
 dbaccess/source/ui/inc/TableWindow.hxx |4 -
 dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx |2 
 4 files changed, 23 insertions(+), 27 deletions(-)

New commits:
commit 9e991e1852fa764e78d88b5d3aab17e45ac9213e
Author: Gábor Nyers gny...@opensuse.org
Date:   Sat Mar 2 21:08:46 2013 +

fdo#39468 Translated German comments to English

Change-Id: If4f8e308cfae6a4ba64576c1b2844210e64085a0

diff --git a/comphelper/inc/comphelper/syntaxhighlight.hxx 
b/comphelper/inc/comphelper/syntaxhighlight.hxx
index 11a57db..ef1a948 100644
--- a/comphelper/inc/comphelper/syntaxhighlight.hxx
+++ b/comphelper/inc/comphelper/syntaxhighlight.hxx
@@ -63,10 +63,10 @@ struct HighlightPortion { sal_uInt16 nBegin; sal_uInt16 
nEnd; TokenTypes tokenTy
 typedef std::vectorHighlightPortion HighlightPortions;
 
 /
-// Hilfsklasse zur Untersuchung von JavaScript-Modulen, zunaechst zum
-// Heraussuchen der Funktionen, spaeter auch zum Syntax-Highlighting verwenden
+// Auxiliary class to support JavaScript modules, next to find functions which
+// will later will be used for syntax highlighting
 
-//  Flags fuer Zeichen-Eigenschaften
+// Flags for character properties
 #define CHAR_START_IDENTIFIER   0x0001
 #define CHAR_IN_IDENTIFIER  0x0002
 #define CHAR_START_NUMBER   0x0004
@@ -81,8 +81,8 @@ typedef std::vectorHighlightPortion HighlightPortions;
 #define CHAR_EOF0x00
 
 
-// Sprachmodus des HighLighters (spaeter eventuell feiner
-// differenzieren mit Keyword-Liste, C-Kommentar-Flag)
+// Language mode of the Highlighter (possibly to be refined later with keyword
+// lists, C comment flags)
 enum HighlighterLanguage
 {
 HIGHLIGHT_BASIC,
@@ -92,23 +92,23 @@ enum HighlighterLanguage
 class SimpleTokenizer_Impl
 {
 HighlighterLanguage aLanguage;
-// Zeichen-Info-Tabelle
+// Character information tables
 sal_uInt16 aCharTypeTab[256];
 
 const sal_Unicode* mpStringBegin;
 const sal_Unicode* mpActualPos;
 
-// Zeile und Spalte
+// Lines and columns
 sal_uInt32 nLine;
 sal_uInt32 nCol;
 
 sal_Unicode peekChar( void ){ return *mpActualPos; }
 sal_Unicode getChar( void ) { nCol++; return *mpActualPos++; }
 
-// Hilfsfunktion: Zeichen-Flag Testen
+// Auxiliary function: testing of the character flags
 sal_Bool testCharFlags( sal_Unicode c, sal_uInt16 nTestFlags );
 
-// Neues Token holen, Leerstring == nix mehr da
+// Get new token, EmptyString == nothing more over there
 sal_Bool getNextToken( /*out*/TokenTypes reType,
 /*out*/const sal_Unicode* rpStartPos, /*out*/const sal_Unicode* 
rpEndPos );
 
@@ -126,13 +126,11 @@ public:
 };
 
 
-//*** SyntaxHighlighter-Klasse ***
-// Konzept: Der Highlighter wird ueber alle Aenderungen im Source
-// informiert (notifyChange) und liefert dem Aufrufer jeweils die
-// Information zurueck, welcher Zeilen-Bereich des Source-Codes
-// aufgrund dieser Aenderung neu gehighlighted werden muss.
-// Dazu merkt sich Highlighter intern fuer jede Zeile, ob dort
-// C-Kommentare beginnen oder enden.
+//*** SyntaxHighlighter Class ***
+// Concept: the Highlighter will be notified of all changes in the source
+// (notifyChange) and returns the caller the range of lines, which based on the
+// changes, need to be highlighted again. For this the Highlighter marks all
+// lines internally whether or not C comments begin or end.
 class COMPHELPER_DLLPUBLIC SyntaxHighlighter
 {
 HighlighterLanguage eLanguage;
@@ -146,10 +144,9 @@ public:
 SyntaxHighlighter( void );
 ~SyntaxHighlighter( void );
 
-// HighLighter (neu) initialisieren, die Zeilen-Tabelle wird
-// dabei komplett geloescht, d.h. im Abschluss wird von einem
-// leeren Source ausgegangen. In notifyChange() kann dann
-// nur Zeile 0 angegeben werden.
+// (Re-)initialize Highlighter. The line-table will be completely erased,
+// meaning that on completion an empty Source is assumed.
+// notifyChange() can only be given line 0
 void initialize( HighlighterLanguage eLanguage_ );
 
 void notifyChange( sal_uInt32 nLine, sal_Int32 nLineCountDifference,
diff --git a/comphelper/source/misc/syntaxhighlight.cxx 
b/comphelper/source/misc/syntaxhighlight.cxx
index 2064c0c..84790eb 100644
--- a/comphelper/source/misc/syntaxhighlight.cxx
+++ b/comphelper/source/misc/syntaxhighlight.cxx
@@ -411,9 +411,8 @@ sal_Bool SimpleTokenizer_Impl::getNextToken( 
/*out*/TokenTypes reType,
 reType = TT_COMMENT;
 }
 
-// Echter Operator, kann hier einfach behandelt werden,
-// da nicht der wirkliche Operator, wie z.B. += interessiert,
-// sondern nur die Tatsache, dass es sich um einen handelt.
+

[Libreoffice-commits] core.git: comphelper/inc comphelper/source filter/source sc/source sd/source sw/source

2013-02-04 Thread Kohei Yoshida 
 comphelper/inc/comphelper/mediadescriptor.hxx |2 ++
 comphelper/source/misc/mediadescriptor.cxx|6 ++
 filter/source/config/cache/typedetection.cxx  |2 ++
 sc/source/ui/unoobj/scdetect.cxx  |   12 +---
 sd/source/ui/unoidl/sddetect.cxx  |7 +++
 sw/source/ui/uno/swdetect.cxx |7 +++
 6 files changed, 33 insertions(+), 3 deletions(-)

New commits:
commit 709f6ba6ae5d2b5461136595a2469bf1fe32ccff
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Mon Feb 4 14:14:15 2013 -0500

fdo#59426: Don't try to repair package during flat detection phase.

Change-Id: I35968241a79db0aabe06e25c0efac2aa3d1c5b84

diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx 
b/comphelper/inc/comphelper/mediadescriptor.hxx
index 53dcffc..8c55f85 100644
--- a/comphelper/inc/comphelper/mediadescriptor.hxx
+++ b/comphelper/inc/comphelper/mediadescriptor.hxx
@@ -94,6 +94,8 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public 
SequenceAsHashMap
 static const ::rtl::OUString PROP_VIEWONLY();
 static const ::rtl::OUString PROP_DOCUMENTBASEURL();
 
+static const OUString PROP_DEEPDETECTION();
+
 //---
 // interface
 public:
diff --git a/comphelper/source/misc/mediadescriptor.cxx 
b/comphelper/source/misc/mediadescriptor.cxx
index bd73733..5a217a1 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -296,6 +296,12 @@ const OUString MediaDescriptor::PROP_DOCUMENTBASEURL()
 return sProp;
 }
 
+const OUString MediaDescriptor::PROP_DEEPDETECTION()
+{
+static const OUString aProp(DeepDetection);
+return aProp;
+}
+
 MediaDescriptor::MediaDescriptor()
 : SequenceAsHashMap()
 {
diff --git a/filter/source/config/cache/typedetection.cxx 
b/filter/source/config/cache/typedetection.cxx
index e7c0bc0..36b38a8 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -329,6 +329,8 @@ void printFlatDetectionList(const char* caption, const 
FlatDetection types)
 (bAllowDeep)
)
 {
+// Let's the detection service know we are in a deep detection 
phase.
+stlDescriptor[comphelper::MediaDescriptor::PROP_DEEPDETECTION()] 
= sal_True;
 sType = impl_detectTypeDeepOnly(stlDescriptor, lUsedDetectors);
 }
 
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 53c69f8..94c1f7f 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -244,6 +244,7 @@ static sal_Bool lcl_MayBeDBase( SvStream rStream )
 
 sal_Bool bRepairPackage = false;
 sal_Bool bRepairAllowed = false;
+bool bDeepDetection = false;
 
 // now some parameters that can already be in the array, but may be 
overwritten or new inserted here
 // remember their indices in the case new values must be added to the array
@@ -300,6 +301,8 @@ static sal_Bool lcl_MayBeDBase( SvStream rStream )
 lDescriptor[nProperty].Value = bRepairPackage;
 else if ( lDescriptor[nProperty].Name == DocumentTitle )
 nIndexOfDocumentTitle = nProperty;
+else if (lDescriptor[nProperty].Name == DeepDetection)
+bDeepDetection = lDescriptor[nProperty].Value.getsal_Bool();
 }
 
 // can't check the type for external filters, so set the dont flag 
accordingly
@@ -382,6 +385,10 @@ static sal_Bool lcl_MayBeDBase( SvStream rStream )
 }
 catch( const lang::WrappedTargetException aWrap )
 {
+if (!bDeepDetection)
+// Bail out early unless it's a deep detection.
+return OUString();
+
 packages::zip::ZipIOException aZipException;
 
 // repairing is done only if this type is requested 
from outside
@@ -424,9 +431,8 @@ static sal_Bool lcl_MayBeDBase( SvStream rStream )
 aTypeName.Erase();
 }
 
-   if ( aTypeName.Len() )
-   pFilter = SfxFilterMatcher( rtl::OUString(scalc) 
).GetFilter4EA( aTypeName );
-
+if ( aTypeName.Len() )
+pFilter = SfxFilterMatcher( rtl::OUString(scalc) 
).GetFilter4EA( aTypeName );
 }
 }
 else
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index eff86c5..d140345 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -102,6 +102,7 @@ SdFilterDetect::~SdFilterDetect()
 
 sal_Bool bRepairPackage = sal_False;
 sal_Bool bRepairAllowed = sal_False;
+bool bDeepDetection = false;
 
 // now some parameters that can already be in the array, but may be 
overwritten or new inserted