[Libreoffice-commits] .: binfilter/inc
binfilter/inc/bf_svtools/svdde.hxx |4
1 file changed, 4 insertions(+)
New commits:
commit b85701cac464778e0717773da342450648151e97
Author: Caolán McNamara caol...@redhat.com
Date: Thu May 3 18:00:18 2012 +0100
Revert Remove unused parts
This reverts commit 1a0db504b60623eeb45d64a8ce8d1463983f6c2a.
They seem to be built under windows and the windows build-bots
are complaining.
diff --git a/binfilter/inc/bf_svtools/svdde.hxx
b/binfilter/inc/bf_svtools/svdde.hxx
index f9aa33a..e74f360 100644
--- a/binfilter/inc/bf_svtools/svdde.hxx
+++ b/binfilter/inc/bf_svtools/svdde.hxx
@@ -55,6 +55,8 @@ struct DdeDataImp;
struct DdeImp;
DECLARE_LIST( DdeConnections, DdeConnection* )
+DECLARE_LIST( DdeTransactions, DdeTransaction* )
+DECLARE_LIST( DdeFormats, long )
#ifdef WNT
class DdeService;
@@ -234,6 +236,7 @@ class DdeConnection
{
friend classDdeInternal;
friend classDdeTransaction;
+DdeTransactions aTransactions;
DdeString* pService;
DdeString* pTopic;
DdeImp* pImp;
@@ -394,6 +397,7 @@ protected:
const DdeTopic* GetSysTopic() const { return pSysTopic; }
private:
DdeTopics aTopics;
+DdeFormats aFormats;
DdeTopic* pSysTopic;
DdeString* pName;
ConvList* pConv;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/inc
binfilter/inc/bf_svtools/svdde.hxx |4
1 file changed, 4 deletions(-)
New commits:
commit 1a0db504b60623eeb45d64a8ce8d1463983f6c2a
Author: Julien Nabet serval2...@yahoo.fr
Date: Wed May 2 12:26:52 2012 +0200
Remove unused parts
Change-Id: Ife64c1e95ae1dcf5554fc8e59d1afbffa3ffebec
diff --git a/binfilter/inc/bf_svtools/svdde.hxx
b/binfilter/inc/bf_svtools/svdde.hxx
index e74f360..f9aa33a 100644
--- a/binfilter/inc/bf_svtools/svdde.hxx
+++ b/binfilter/inc/bf_svtools/svdde.hxx
@@ -55,8 +55,6 @@ struct DdeDataImp;
struct DdeImp;
DECLARE_LIST( DdeConnections, DdeConnection* )
-DECLARE_LIST( DdeTransactions, DdeTransaction* )
-DECLARE_LIST( DdeFormats, long )
#ifdef WNT
class DdeService;
@@ -236,7 +234,6 @@ class DdeConnection
{
friend classDdeInternal;
friend classDdeTransaction;
-DdeTransactions aTransactions;
DdeString* pService;
DdeString* pTopic;
DdeImp* pImp;
@@ -397,7 +394,6 @@ protected:
const DdeTopic* GetSysTopic() const { return pSysTopic; }
private:
DdeTopics aTopics;
-DdeFormats aFormats;
DdeTopic* pSysTopic;
DdeString* pName;
ConvList* pConv;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/inc
binfilter/inc/bf_tools/table.hxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit baafe1cf57fa101e6308ed9f60cf0be46d3c22d8
Author: Michael Stahl mst...@redhat.com
Date: Wed Apr 18 23:12:58 2012 +0200
table.hxx: oops, forgot TOOLS_DLLPUBLIC in there
diff --git a/binfilter/inc/bf_tools/table.hxx b/binfilter/inc/bf_tools/table.hxx
index e39b334..89d61af 100644
--- a/binfilter/inc/bf_tools/table.hxx
+++ b/binfilter/inc/bf_tools/table.hxx
@@ -28,7 +28,6 @@
#ifndef _TOOLS_TABLE_HXX
#define _TOOLS_TABLE_HXX
-#include tools/toolsdllapi.h
#include tools/solar.h
#include bf_tools/contnr.hxx
@@ -41,11 +40,11 @@ namespace binfilter
#define TABLE_ENTRY_NOTFOUND CONTAINER_ENTRY_NOTFOUND
-class TOOLS_DLLPUBLIC Table : private Container
+class Table : private Container
{
private:
sal_uIntPtr nCount;
-TOOLS_DLLPRIVATE sal_uIntPtrImplGetIndex( sal_uIntPtr nKey,
sal_uIntPtr* pIndex = NULL ) const;
+SAL_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 )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/inc
binfilter/inc/bf_svtools/cancel.hxx | 49
1 file changed, 49 insertions(+)
New commits:
commit 4d74905bf959fcce368f2dbf79021417484b75b8
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 23 12:23:21 2012 +
move SvWeakBase etc into binfilter
diff --git a/binfilter/inc/bf_svtools/cancel.hxx
b/binfilter/inc/bf_svtools/cancel.hxx
index 5cbab0a..7dc72c1 100644
--- a/binfilter/inc/bf_svtools/cancel.hxx
+++ b/binfilter/inc/bf_svtools/cancel.hxx
@@ -48,6 +48,55 @@ typedef SvPtrarr SfxCancellables_Impl;
//-
+class SvWeakBase;
+class SvWeakHdl : public SvRefBase
+{
+friend class SvWeakBase;
+SvWeakBase* _pObj;
+public:
+void ResetWeakBase( ) { _pObj = 0; }
+private:
+SvWeakHdl( SvWeakBase* pObj ) : _pObj( pObj ) {}
+public:
+SvWeakBase* GetObj() { return _pObj; }
+};
+
+SV_DECL_IMPL_REF( SvWeakHdl )
+
+class SvWeakBase
+{
+SvWeakHdlRef _xHdl;
+public:
+SvWeakHdl* GetHdl() { return _xHdl; }
+
+// Wg CompilerWarnung nicht ueber Initializer
+SvWeakBase() { _xHdl = new SvWeakHdl( this ); }
+~SvWeakBase() { _xHdl-ResetWeakBase(); }
+};
+
+#define SV_DECL_WEAK( ClassName ) \
+class ClassName##Weak \
+{ \
+SvWeakHdlRef _xHdl; \
+public: \
+inline ClassName##Weak( ) {} \
+inline ClassName##Weak( ClassName* pObj ) { \
+if( pObj ) _xHdl = pObj-GetHdl(); }\
+inline void Clear() { _xHdl.Clear(); } \
+inline ClassName##Weak operator = ( ClassName * pObj ) { \
+_xHdl = pObj ? pObj-GetHdl() : 0; return *this; } \
+inline sal_BoolIs() const { \
+return _xHdl.Is() _xHdl-GetObj(); } \
+inline ClassName * operator () const { \
+return (ClassName*) ( _xHdl.Is() ? _xHdl-GetObj() : 0 ); } \
+inline ClassName * operator - () const { \
+return (ClassName*) ( _xHdl.Is() ? _xHdl-GetObj() : 0 ); } \
+inline ClassName operator * () const { \
+return *(ClassName*) _xHdl-GetObj(); } \
+inline operator ClassName * () const { \
+return (ClassName*) (_xHdl.Is() ? _xHdl-GetObj() : 0 ); } \
+};
+
class SfxCancelManager: public SfxBroadcaster
, public SvWeakBase
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/inc
binfilter/inc/bf_svtools/fileview.hxx | 265 --
1 file changed, 265 deletions(-)
New commits:
commit 55ee10fea8ecfe0d471674d5fc7f09be2808b3df
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Mar 14 22:14:18 2012 +0100
Dead code
diff --git a/binfilter/inc/bf_svtools/fileview.hxx
b/binfilter/inc/bf_svtools/fileview.hxx
deleted file mode 100644
index aa46281..000
--- a/binfilter/inc/bf_svtools/fileview.hxx
+++ /dev/null
@@ -1,265 +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 _SVT_FILEVIEW_HXX
-#define _SVT_FILEVIEW_HXX
-
-#include bf_svtools/svtdllapi.h
-
-#include com/sun/star/uno/Sequence.h
-#include com/sun/star/ucb/XContent.hpp
-
-#include vcl/ctrl.hxx
-#include vcl/image.hxx
-#include vcl/fixed.hxx
-#include vcl/button.hxx
-#include vcl/dialog.hxx
-
-namespace binfilter
-{
-
-// class SvtFileView -
-
-#define FILEVIEW_ONLYFOLDER 0x0001
-#define FILEVIEW_MULTISELECTION 0x0002
-
-#define FILEVIEW_SHOW_TITLE 0x0010
-#define FILEVIEW_SHOW_SIZE 0x0020
-#define FILEVIEW_SHOW_DATE 0x0040
-#define FILEVIEW_SHOW_ALL 0x0070
-
-class ViewTabListBox_Impl;
-class SvtFileView_Impl;
-class SvLBoxEntry;
-class HeaderBar;
-class IUrlFilter;
-
-/// the result of an action in the FileView
-enum FileViewResult
-{
-eSuccess,
-eFailure,
-eTimeout,
-eStillRunning
-};
-
-/// describes parameters for doing an action on the FileView asynchronously
-struct FileViewAsyncAction
-{
-sal_uInt32 nMinTimeout;/// minimum time to wait for a result, in
milliseconds
-sal_uInt32 nMaxTimeout;/// maximum time to wait for a result, in
milliseconds, until eTimeout is returned
-LinkaFinishHandler; /// the handler to be called when the action
is finished. Called in every case, no matter of the result
-
-FileViewAsyncAction()
-{
-nMinTimeout = nMaxTimeout = 0;
-}
-};
-
-class SvtFileView : public Control
-{
-private:
-SvtFileView_Impl* mpImp;
-
-voidOpenFolder( const ::com::sun::star::uno::Sequence
::rtl::OUString aContents );
-
-DECL_LINK( HeaderSelect_Impl, HeaderBar * );
-DECL_LINK( HeaderEndDrag_Impl, HeaderBar * );
-
-protected:
-virtual void GetFocus();
-
-public:
-SvtFileView( Window* pParent, const ResId rResId, sal_Bool bOnlyFolder,
sal_Bool bMultiSelection );
-SvtFileView( Window* pParent, const ResId rResId, sal_Int8 nFlags );
-~SvtFileView();
-
-const String GetViewURL() const;
-String GetURL( SvLBoxEntry* pEntry ) const;
-String GetCurrentURL() const;
-
-sal_BoolGetParentURL( String _rParentURL ) const;
-sal_BoolCreateNewFolder( const String rNewFolder );
-
-voidSetHelpId( sal_uInt32 nHelpId );
-sal_uInt32 GetHelpId( ) const;
-voidSetSizePixel( const Size rNewSize );
-using Window::SetPosSizePixel;
-virtual voidSetPosSizePixel( const Point rNewPos, const Size
rNewSize );
-
-/** initialize the view with the content of a folder given by URL, and
aply an immediate filter
-
-@param rFolderURL
-the URL of the folder whose content is to be read
-@param rFilter
-the initial filter to be applied
-@param pAsyncDescriptor
-If not NULL/, this struct describes the parameters for doing the
-action asynchronously.
-*/
-FileViewResult Initialize(
-const String rFolderURL,
-const String rFilter,
-
[Libreoffice-commits] .: binfilter/inc
binfilter/inc/bf_tools/unqidx.hxx | 61 ++
1 file changed, 4 insertions(+), 57 deletions(-)
New commits:
commit 5e6d0520fee252dbb5db62536849a547faa639aa
Author: Caolán McNamara caol...@redhat.com
Date: Wed Feb 29 10:08:44 2012 +
drop unused DECLARE_UNIQUEINDEX
diff --git a/binfilter/inc/bf_tools/unqidx.hxx
b/binfilter/inc/bf_tools/unqidx.hxx
index 3bcd88a..273f670 100644
--- a/binfilter/inc/bf_tools/unqidx.hxx
+++ b/binfilter/inc/bf_tools/unqidx.hxx
@@ -46,6 +46,10 @@ private:
sal_uIntPtr nUniqIndex;
sal_uIntPtr nCount;
+sal_uIntPtr Insert( sal_uIntPtr nIndex, void* p );
+void* Get( sal_uIntPtr nIndex ) const;
+void* Seek( void* p );
+
public:
using Container::GetCurObject;
@@ -54,10 +58,8 @@ public:
sal_uIntPtr nReSize = 16 );
UniqueIndex( const UniqueIndex rIdx );
-sal_uIntPtr Insert( sal_uIntPtr nIndex, void* p );
sal_uIntPtr Insert( void* p );
void* Remove( sal_uIntPtr nIndex );
-void* Get( sal_uIntPtr nIndex ) const;
voidClear();
sal_uIntPtr Count() const { return nCount; }
@@ -67,7 +69,6 @@ public:
sal_BoolIsIndexValid( sal_uIntPtr nIndex ) const;
void* Seek( sal_uIntPtr nIndex );
-void* Seek( void* p );
void* First();
void* Last();
void* Next();
@@ -91,60 +92,6 @@ inline void UniqueIndex::Clear()
nUniqIndex = 0;
}
-// ---
-// - DECLARE_UNIQUEINDEX -
-// ---
-
-#define DECLARE_UNIQUEINDEX( ClassName, Type ) \
-class ClassName : private UniqueIndex \
-{ \
-public: \
-using UniqueIndex::Clear;
\
-using UniqueIndex::Count;
\
-using UniqueIndex::GetCurIndex; \
-using UniqueIndex::IsIndexValid;
\
-using UniqueIndex::GetStartIndex;
\
-using UniqueIndex::GetCurMaxIndex; \
-\
-ClassName( sal_uIntPtr _nStartIndex = 0, \
- sal_uIntPtr _nInitSize = 16, sal_uIntPtr _nReSize =
16 ):\
-UniqueIndex( _nStartIndex, _nInitSize, _nReSize ) {}\
-ClassName( const ClassName rClassName ) : \
-UniqueIndex( rClassName ) {}\
-\
-sal_uIntPtr Insert( sal_uIntPtr nIndex, Type p )
\
-{ return UniqueIndex::Insert( nIndex, (void*)p ); } \
-sal_uIntPtr Insert( Type p )\
-{ return UniqueIndex::Insert( (void*)p ); } \
-TypeRemove( sal_uIntPtr nIndex ) \
-{ return (Type)UniqueIndex::Remove( nIndex ); } \
-TypeGet( sal_uIntPtr nIndex ) const \
-{ return (Type)UniqueIndex::Get( nIndex ); }\
-\
-TypeGetCurObject() const\
-{ return (Type)UniqueIndex::GetCurObject(); } \
-sal_uIntPtr GetIndex( const Type p ) const \
-{ return UniqueIndex::GetIndex( (const void*)p ); } \
-\
-TypeSeek( sal_uIntPtr nKey ) \
-{ return (Type)UniqueIndex::Seek( nKey ); } \
-TypeSeek( Type p ) \
-{ return (Type)UniqueIndex::Seek( (void*)p ); } \
-TypeFirst() { return (Type)UniqueIndex::First(); } \
-TypeLast() { return (Type)UniqueIndex::Last(); } \
-TypeNext() { return (Type)UniqueIndex::Next(); } \
-TypePrev() { return (Type)UniqueIndex::Prev(); } \
-\
-ClassName operator =( const ClassName rClassName ) \
-{ UniqueIndex::operator =( rClassName );\
-
[Libreoffice-commits] .: binfilter/inc
binfilter/inc/bf_tools/string.hxx |6 --
1 file changed, 6 deletions(-)
New commits:
commit 1807578ea9f2d5518244839d4607316b7455fb20
Author: Caolán McNamara caol...@redhat.com
Date: Wed Feb 15 10:05:42 2012 +
lock in those ByteString gains so there's no back-sliding
diff --git a/binfilter/inc/bf_tools/string.hxx
b/binfilter/inc/bf_tools/string.hxx
index 3eab25a..b5944c0 100644
--- a/binfilter/inc/bf_tools/string.hxx
+++ b/binfilter/inc/bf_tools/string.hxx
@@ -261,8 +261,6 @@ public:
const sal_Char* GetBuffer() const { return mpData-maStr; }
-friend sal_Bool operator == ( const ::ByteString rStr1, const
ByteString rStr2 )
-{ return rStr1.Equals( rStr2 ); }
friend sal_Bool operator == ( const ByteString rStr1, const
::ByteString rStr2 )
{ return rStr1.Equals( rStr2 ); }
friend sal_Bool operator == ( const ByteString rStr1, const
ByteString rStr2 )
@@ -271,10 +269,6 @@ public:
{ return rStr.Equals( pCharStr ); }
friend sal_Bool operator == ( const sal_Char* pCharStr, const
ByteString rStr )
{ return rStr.Equals( pCharStr ); }
-friend sal_Bool operator != ( const ::ByteString rStr1, const
ByteString rStr2 )
-{ return !(operator == ( rStr1, rStr2 )); }
-friend sal_Bool operator != ( const ByteString rStr1, const
::ByteString rStr2 )
-{ return !(operator == ( rStr1, rStr2 )); }
friend sal_Bool operator != ( const ByteString rStr1, const
ByteString rStr2 )
{ return !(operator == ( rStr1, rStr2 )); }
friend sal_Bool operator != ( const ByteString rStr, const
sal_Char* pCharStr )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/inc
binfilter/inc/bf_sfx2/sfxsids.hrc |3 --- 1 file changed, 3 deletions(-) New commits: commit 6b7448e04adfd2ecf27f0a28f02ba050826b44c7 Author: Caolán McNamara caol...@redhat.com Date: Fri Jan 6 16:35:16 2012 + ditch commented out SID diff --git a/binfilter/inc/bf_sfx2/sfxsids.hrc b/binfilter/inc/bf_sfx2/sfxsids.hrc index 6961af7..52400dd 100644 --- a/binfilter/inc/bf_sfx2/sfxsids.hrc +++ b/binfilter/inc/bf_sfx2/sfxsids.hrc @@ -705,9 +705,6 @@ #define SID_COPY(SID_SFX_START + 711) #define SID_PASTE (SID_SFX_START + 712) -// steht unter diesem Wert in chaos/cntids.hrc!!! -//#define SID_DELETE(SID_SFX_START + 713) - #define SID_BACKSPACE (SID_SFX_START + 714) #define SID_SELECT (SID_SFX_START + 720) #define SID_EXPANDSELECTION (SID_SFX_START + 721) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
