[Libreoffice-commits] .: 3 commits - binfilter/bf_forms binfilter/bf_sch binfilter/bf_so3 binfilter/bf_svtools binfilter/inc
binfilter/bf_forms/source/component/forms_imgprod.cxx |4 +-
binfilter/bf_sch/source/core/sch_chtmode2.cxx |2 -
binfilter/bf_sch/source/core/sch_chtmode3.cxx |4 --
binfilter/bf_sch/source/core/sch_chtmode4.cxx |4 +-
binfilter/bf_sch/source/core/sch_chtmode9.cxx |4 +-
binfilter/bf_sch/source/core/sch_chtmodel.cxx |4 +-
binfilter/bf_sch/source/ui/app/sch_schopt.cxx |7 +--
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx |4 +-
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartData.cxx |2 -
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx | 10 ++---
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx |6 +--
binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx | 18 -
binfilter/bf_so3/source/persist/binddata.cxx |4 +-
binfilter/bf_so3/source/persist/transprt.cxx | 22 +--
binfilter/bf_svtools/source/items/svt_intitem.cxx |6 +--
binfilter/bf_svtools/source/items1/svt_cintitem.cxx| 24 ++---
binfilter/bf_svtools/source/items1/svt_ctypeitm.cxx|4 +-
binfilter/bf_svtools/source/items1/svt_custritm.cxx|2 -
binfilter/bf_svtools/source/items1/svt_visitem.cxx |2 -
binfilter/inc/bf_svtools/ilstitem.hxx |2 -
20 files changed, 65 insertions(+), 70 deletions(-)
New commits:
commit 99e42be7c4afcff0177992aebe8de9559b7a5f45
Author: Thomas Arnhold tho...@arnhold.org
Date: Fri May 4 06:15:30 2012 +0200
fdo#48253: Expand SAL_STATIC_CAST leftovers
Change-Id: Ibda77aa3010928513bd7d0b57a1d1045343607b5
diff --git a/binfilter/bf_sch/source/core/sch_chtmode2.cxx
b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
index 6dbbcc5..2bd471a 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode2.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
@@ -401,7 +401,7 @@ enum ChartStyleV0
/*N*/ if( bForceSolidLine )
/*N*/ {
/*N*/ XLineStyle eLineStyle =
-/*N*/ SAL_STATIC_CAST( const XLineStyleItem *,
(pSymbolAttr-Get( XATTR_LINESTYLE )) )-GetValue(); // bug in Win-C++
compiler: casting to pointer
+/*N*/ (static_cast const XLineStyleItem * (
(pSymbolAttr-Get( XATTR_LINESTYLE )) ))-GetValue(); // bug in Win-C++
compiler: casting to pointer
/*N*/
/*N*/ if( eLineStyle == XLINE_NONE )
/*N*/ {
diff --git a/binfilter/bf_sch/source/core/sch_chtmode3.cxx
b/binfilter/bf_sch/source/core/sch_chtmode3.cxx
index 272021c..599d8a3 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode3.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode3.cxx
@@ -62,8 +62,6 @@
#define ITEMID_SIZE 0
#include bf_svx/sizeitem.hxx
#endif
-// header for SAL_STATIC_CAST
-#include sal/types.h
#include bf_svx/xlnedit.hxx
#include bf_svx/xlnstit.hxx
@@ -654,7 +652,7 @@ namespace binfilter {
/*?*/ else// rectangle with border, if linesytle is NONE
/*?*/ {
/*?*/ XLineStyle eLineStyle =
-/*?*/ SAL_STATIC_CAST( const XLineStyleItem *,
(rSymbolAttr.Get( XATTR_LINESTYLE )) )-GetValue(); // bug in Win-C++
compiler: casting to pointer
+/*?*/ (static_cast const XLineStyleItem * (
(rSymbolAttr.Get( XATTR_LINESTYLE )) ))-GetValue(); // bug in Win-C++
compiler: casting to pointer
/*?*/
/*?*/ if( eLineStyle == XLINE_NONE )// clear items
for defaults to take effect
/*?*/ {
diff --git a/binfilter/bf_sch/source/ui/app/sch_schopt.cxx
b/binfilter/bf_sch/source/ui/app/sch_schopt.cxx
index e1ddf98..89a5283 100644
--- a/binfilter/bf_sch/source/ui/app/sch_schopt.cxx
+++ b/binfilter/bf_sch/source/ui/app/sch_schopt.cxx
@@ -27,9 +27,6 @@
/
#include com/sun/star/uno/Sequence.hxx
-// header for SvStream
-// header for SAL_STATIC_CAST
-#include sal/types.h
#include schopt.hxx
@@ -66,7 +63,7 @@ using namespace ::com::sun::star;
/*N*/ XColorEntry* SchColorTable::Get( ULONG nKey ) const
/*N*/ {
-/*N*/ return SAL_STATIC_CAST( XColorEntry*, Table::Get( nKey ) );
+/*N*/ return (static_cast XColorEntry* (Table::Get( nKey )) );
/*N*/ }
/*N*/ Color SchColorTable::GetColor( ULONG nKey ) const
@@ -145,7 +142,7 @@ using namespace ::com::sun::star;
/*N*/ // set color values
/*N*/ for( sal_Int32 i=0; i nCount; i++ )
/*N*/ {
-/*N*/ aCol.SetColor( SAL_STATIC_CAST( ColorData, aColorSeq[ i ] ));
+/*N*/ aCol.SetColor( (static_cast ColorData ( aColorSeq[ i ] ) ));
/*N*/
/*N*/ aName = aPrefix;
/*N*/ aName.Append( String::CreateFromInt32( i + 1 ));
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx
b/binfilter/bf_sch/source/ui/unoidl
[Libreoffice-commits] .: fpicker/source
fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx |8
+++-
fpicker/source/win32/filepicker/vistatypes.h |8
+++-
2 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit ea822495b776a8b0b9d6b99299fdbc7bfc8db340
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Apr 21 13:26:30 2012 +0200
Partially revert: Replace css macro with namespace for nicer namespacing
To fix the build. I can't test it on win32, thought it would work...
diff --git a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
index ca1b223..47909d7 100644
--- a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
+++ b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
@@ -45,7 +45,11 @@
// namespace
//-
-namespace css = ::com::sun::star;
+#ifdef css
+#error Clash on using CSS as namespace define.
+#else
+#define css ::com::sun::star
+#endif
namespace fpicker{
namespace win32{
@@ -69,6 +73,8 @@ class IVistaFilePickerInternalNotify
}}}
+#undef css
+
#endif // FPICKER_WIN32_VISTA_FILEPICKER_INTERNALNOTIFY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/vistatypes.h
b/fpicker/source/win32/filepicker/vistatypes.h
index e1b1fc5..08b4613 100644
--- a/fpicker/source/win32/filepicker/vistatypes.h
+++ b/fpicker/source/win32/filepicker/vistatypes.h
@@ -40,7 +40,11 @@
// namespace
//-
-namespace css = ::com::sun::star;
+#ifdef css
+#error Clash on using CSS as namespace define.
+#else
+#define css ::com::sun::star
+#endif
namespace fpicker{
namespace win32{
@@ -60,6 +64,8 @@ typedef ComPtr IFileDialogCustomize, IID_IFileDialogCustomize
} // namespace win32
} // namespace fpicker
+#undef css
+
#endif // FPICKER_WIN32_VISTA_TYPES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source dbaccess/source fpicker/source framework/inc framework/source scripting/source sfx2/inc svl/source svtools/inc svtools/source svx/source unotools/source
cui/source/inc/acccfg.hxx |6 -
cui/source/inc/cfgutil.hxx |4 ---
dbaccess/source/ui/control/sqledit.cxx |6 -
fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx |8
---
fpicker/source/win32/filepicker/VistaFilePicker.hxx|8
---
fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx|8
---
fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx|8
---
fpicker/source/win32/filepicker/asyncrequests.hxx |8
---
fpicker/source/win32/filepicker/vistatypes.h |8
---
framework/inc/framework/preventduplicateinteraction.hxx| 10
+
framework/inc/framework/titlehelper.hxx| 10
+
framework/source/inc/accelerators/storageholder.hxx| 10
+
framework/source/uielement/statusbarmanager.cxx|4 ---
scripting/source/inc/util/MiscUtils.hxx|4 +--
scripting/source/protocolhandler/scripthandler.cxx |3 --
scripting/source/provider/ActiveMSPList.hxx|4 +--
scripting/source/provider/BrowseNodeFactoryImpl.hxx|4 +--
scripting/source/provider/MasterScriptProvider.hxx |4 +--
scripting/source/provider/MasterScriptProviderFactory.hxx |4 +--
scripting/source/provider/ProviderCache.hxx|4 +--
scripting/source/provider/ScriptImpl.hxx |5 +---
scripting/source/provider/ScriptingContext.hxx |5 ++--
scripting/source/provider/URIHelper.hxx|4 +--
scripting/source/runtimemgr/ScriptNameResolverImpl.hxx |4 +--
scripting/source/runtimemgr/ScriptRuntimeManager.hxx |4 +--
scripting/source/runtimemgr/StorageBridge.hxx |4 +--
scripting/source/runtimemgr/StorageBridgeFactory.hxx |4 +--
sfx2/inc/sfx2/sfxbasemodel.hxx |9
+---
svl/source/config/itemholder2.hxx | 11
--
svtools/inc/svtools/acceleratorexecute.hxx |8
---
svtools/source/config/itemholder2.hxx | 10
-
svx/source/inc/docrecovery.hxx | 10
+
unotools/source/config/itemholder1.hxx |6 -
unotools/source/i18n/instance.hxx |3 --
34 files changed, 53 insertions(+), 159 deletions(-)
New commits:
commit 2abba84aa7c639011956721a4922653130dd09a6
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Apr 21 01:30:38 2012 +0200
Replace css macro with namespace for nicer namespacing
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index ec03c4a..1cfdc81 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -56,7 +56,7 @@
#include sfx2/minarray.hxx
#include cfgutil.hxx
-#define css ::com::sun::star
+namespace css = ::com::sun::star;
class SfxMacroInfoItem;
class SfxConfigGroupListBox_Impl;
@@ -219,10 +219,6 @@ public:
virtual ~SvxShortcutAssignDlg();
};
-
-
-#undef css
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 94c764b..4e0fd27 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -51,7 +51,7 @@ class SfxMacroInfoItem;
struct SfxStyleInfo_Impl;
struct SfxStylesInfo_Impl;
-#define css ::com::sun::star
+namespace css = ::com::sun::star;
struct SfxStyleInfo_Impl
{
@@ -203,8 +203,6 @@ public:
voidSetStylesInfo(SfxStylesInfo_Impl* pStyles);
};
-#undef css
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/control/sqledit.cxx
b/dbaccess/source/ui/control/sqledit.cxx
index 765d6a7..3161879 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -45,11 +45,7 @@
#include svl/smplhint.hxx
-namespace {
-
-namespace css = com::sun::star;
-
-}
+namespace css = ::com::sun::star;
//
// OSqlEdit
diff --git a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
index 47909d7..ca1b223 100644
--- a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
+++ b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
@@ -45,11 +45,7 @@
// namespace
//-
-#ifdef css
-#error
[Libreoffice-commits] .: 5 commits - framework/inc framework/source offapi/com offapi/UnoApi_offapi.mk oox/inc oox/Library_oox.mk oox/Package_inc.mk oox/source qadevOOo/Jar_OOoRunner.mk qadevOOo/objds
framework/inc/services/layoutmanager.hxx | 12 -
framework/source/layoutmanager/layoutmanager.cxx | 14 -
offapi/UnoApi_offapi.mk |1
offapi/com/sun/star/frame/LayoutManager.idl |7
offapi/com/sun/star/frame/XInplaceLayout.idl | 68
-
oox/Library_oox.mk|1
oox/Package_inc.mk|1
oox/inc/oox/core/binaryfilterbase.hxx | 65
-
oox/inc/oox/core/filterbase.hxx | 17 --
oox/source/core/binaryfilterbase.cxx | 72
--
oox/source/core/filterbase.cxx| 13 -
qadevOOo/Jar_OOoRunner.mk |1
qadevOOo/objdsc/fwk/com.sun.star.comp.framework.LayoutManager.csv |2
qadevOOo/tests/java/ifc/frame/_XInplaceLayout.java| 48 --
sc/source/filter/inc/excelfilter.hxx |1
sc/source/filter/inc/workbookhelper.hxx |1
sc/source/filter/oox/workbookhelper.cxx |5
sd/source/filter/ppt/pptin.cxx|2
unusedcode.easy |3
19 files changed, 3 insertions(+), 331 deletions(-)
New commits:
commit 032439617e4c82980d909dd09e10a47471d70aec
Author: Thomas Arnhold tho...@arnhold.org
Date: Thu Apr 12 11:15:14 2012 +0200
unusedcode.easy: remove FilterBase::openSubStorage
diff --git a/oox/inc/oox/core/filterbase.hxx b/oox/inc/oox/core/filterbase.hxx
index 709b386..a4607e2 100644
--- a/oox/inc/oox/core/filterbase.hxx
+++ b/oox/inc/oox/core/filterbase.hxx
@@ -161,18 +161,6 @@ public:
/** Returns the base storage of the imported/exported file. */
StorageRef getStorage() const;
-/** Opens and returns the specified sub storage from the base storage.
-
-@param rStorageName
-The name of the embedded storage. The name may contain slashes to
-open storages from embedded substorages.
-@param bCreateMissing
-True = create missing sub storages (for export filters).
- */
-StorageRef openSubStorage(
-const ::rtl::OUString rStorageName,
-bool bCreateMissing ) const;
-
/** Opens and returns the specified input stream from the base storage.
@param rStreamName
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index ce4fe3d..97f298d 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -363,11 +363,6 @@ StorageRef FilterBase::getStorage() const
return mxImpl-mxStorage;
}
-StorageRef FilterBase::openSubStorage( const OUString rStorageName, bool
bCreateMissing ) const
-{
-return mxImpl-mxStorage-openSubStorage( rStorageName, bCreateMissing );
-}
-
Reference XInputStream FilterBase::openInputStream( const OUString
rStreamName ) const
{
return mxImpl-mxStorage-openInputStream( rStreamName );
diff --git a/unusedcode.easy b/unusedcode.easy
index 5b1ce0f..c619945 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -760,7 +760,6 @@
nullcanvas::SpriteCanvasHelper::genericUpdate(basegfx::B2DConnectedRangescanvas
nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRangescanvas::SpriteRedrawManager::SpriteInfo::ConnectedComponents
const)
nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const,
basegfx::B2DRange const,
basegfx::B2DConnectedRangescanvas::SpriteRedrawManager::SpriteInfo::ConnectedComponents
const)
oox::PropertyMap::dump(com::sun::star::uno::Referencecom::sun::star::beans::XPropertySet)
-oox::core::FilterBase::openSubStorage(rtl::OUString const, bool) const
oox::xls::Alignment::setBiff2Data(unsigned char)
oox::xls::Alignment::setBiff3Data(unsigned short)
oox::xls::Alignment::setBiff4Data(unsigned short)
commit 3030a3a52f9bd89a055f65a2c5033be028da3cc2
Author: Thomas Arnhold tho...@arnhold.org
Date: Thu Apr 12 11:03:22 2012 +0200
offapi: remove obsolete XInplaceLayout (2nd try)
This is related to 10e580c57b907420e8c6d816325445a40a720e4a
diff --git a/framework/inc/services/layoutmanager.hxx
b/framework/inc/services/layoutmanager.hxx
index e9eea8d..09be601 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -67,7 +67,6 @@
#include com/sun/star/awt/XWindowListener.hpp
#include com/sun/star/util/XURLTransformer.hpp
#include com/sun/star/ui/XUIElementFactory.hpp
-#include com/sun/star/frame/XInplaceLayout.hpp
#include com/sun/star/ui/DockingArea.hpp
#include com/sun/star/awt/XTopWindow2.hpp
#include com/sun/star/awt/XDockableWindow.hpp
@@ -79,7 +78,7
[Libreoffice-commits] .: 2 commits - canvas/inc canvas/source editeng/source hwpfilter/source sc/source sd/source svtools/source svx/workben sw/source unusedcode.easy vcl/source
canvas/inc/canvas/elapsedtime.hxx |4 -
canvas/source/tools/elapsedtime.cxx |5 --
editeng/source/editeng/editdbg.cxx|2
editeng/source/editeng/editview.cxx |2
editeng/source/editeng/impedit.cxx|2
editeng/source/rtf/svxrtf.cxx |2
hwpfilter/source/grammar.cxx |6 +-
sc/source/filter/excel/xlpivot.cxx|5 --
sc/source/filter/inc/xlpivot.hxx |2
sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx |2
sd/source/ui/slidesorter/model/SlsVisualState.cxx | 37 --
svtools/source/edit/textdoc.cxx |8 +--
svtools/source/edit/texteng.cxx |2
svtools/source/edit/textundo.cxx |2
svtools/source/edit/xtextedt.cxx |4 -
svtools/source/inc/unoiface.hxx |2
svx/workben/edittest.cxx |2
sw/source/filter/rtf/swparrtf.cxx |2
unusedcode.easy |3 -
vcl/source/control/ilstbox.cxx|6 +-
20 files changed, 20 insertions(+), 80 deletions(-)
New commits:
commit 30fb54aca35c744517ad697f2d299481b02d457f
Author: Thomas Arnhold tho...@arnhold.org
Date: Thu Apr 12 12:35:21 2012 +0200
remove formfeeds
diff --git a/editeng/source/editeng/editdbg.cxx
b/editeng/source/editeng/editdbg.cxx
index c1ef702..af2e37f 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -429,7 +429,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool
bInfoBox )
if ( pEE-pImpEditEngine-GetStyleSheetPool() )
{
sal_uLong nStyles = pEE-pImpEditEngine-GetStyleSheetPool() ?
pEE-pImpEditEngine-GetStyleSheetPool()-Count() : 0;
-fprintf( fp, \n\n
);
+fprintf( fp,
\n\n
);
fprintf( fp, \n== Stylesheets
= );
fprintf( fp,
\n
);
fprintf( fp, \n#Template: %lu\n, nStyles );
diff --git a/editeng/source/editeng/editview.cxx
b/editeng/source/editeng/editview.cxx
index 9bf11c0..81f0284 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -162,7 +162,7 @@ LanguageType lcl_CheckLanguage(
}
- // --
+// --
// class EditView
// --
EditView::EditView( EditEngine* pEng, Window* pWindow )
diff --git a/editeng/source/editeng/impedit.cxx
b/editeng/source/editeng/impedit.cxx
index d3268ce..252da7c 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -71,7 +71,7 @@ inline void lcl_AllignToPixel( Point rPoint, OutputDevice*
pOutDev, short nDiff
rPoint = pOutDev-PixelToLogic( rPoint );
}
- // --
+// --
// class ImpEditView
// --
ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, Window* pWindow )
:
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 91b68e8..45fd74b 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -1150,7 +1150,6 @@ const SfxItemSet SvxRTFParser::GetRTFDefaults()
return *pRTFDefaults;
}
-/* */
SvxRTFStyleType::SvxRTFStyleType( SfxItemPool rPool, const sal_uInt16*
pWhichRange )
: aAttrSet( rPool, pWhichRange )
@@ -1356,7 +1355,6 @@ void SvxRTFItemStackType::SetRTFDefaults( const
SfxItemSet rDefaults )
}
}
-/* */
RTFPlainAttrMapIds::RTFPlainAttrMapIds( const SfxItemPool rPool )
{
diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx
index 99c2f3c..1b76cbb 100644
--- a/hwpfilter/source/grammar.cxx
+++ b/hwpfilter/source/grammar.cxx
@@ -534,7 +534,7 @@ int yydebug;/* nonzero means print parse trace
*/
#ifndef YYMAXDEPTH
#define YYMAXDEPTH 1
#endif
-
+
/* Define __yy_memcpy. Note that the size argument
should be passed with type unsigned int, because that is what the non-GCC
definitions require. With GCC, __builtin_memcpy takes an arg
@@ -578,7 +578,7 @@ __yy_memcpy (char *to, char *from, unsigned int count)
#endif
#endif
-
+
#line 217 /usr/lib/bison.simple
/* The user can define
[Libreoffice-commits] .: ucb/source xmlhelp/source
ucb/source/ucp/file/filglob.cxx |3 ---
ucb/source/ucp/file/shell.cxx |4
xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx |4
xmlhelp/source/cxxhelp/provider/databases.hxx |6 --
xmlhelp/source/cxxhelp/provider/resultsetbase.hxx |3 ---
xmlhelp/source/treeview/tvread.hxx|3 ---
6 files changed, 23 deletions(-)
New commits:
commit d8fc1770099c5bd96ac518561f10840a7dfd62d1
Author: Thomas Arnhold tho...@arnhold.org
Date: Thu Feb 23 12:22:39 2012 +0100
remove all other deprecated header guards
diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index c55cc84..d436fa0 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -32,10 +32,7 @@
#include shell.hxx
#include bc.hxx
#include osl/file.hxx
-#ifndef INCLUDED_STL_VECTOR
#include vector
-#define INCLUDED_STL_VECTOR
-#endif
#include ucbhelper/cancelcommandexecution.hxx
#include com/sun/star/ucb/CommandAbortedException.hpp
#include com/sun/star/ucb/UnsupportedCommandException.hpp
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index a54d4dd..725820d 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -26,11 +26,7 @@
*
/
-#ifndef INCLUDED_STL_STACK
#include stack
-#define INCLUDED_STL_STACK
-#endif
-
#include osl/diagnose.h
#include rtl/uri.hxx
#include rtl/ustrbuf.hxx
diff --git a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
index aaa7244..5f28e8e 100644
--- a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
+++ b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
@@ -28,14 +28,10 @@
#ifndef _XMLSEARCH_UTIL_DECOMPRESSOR_HXX_
#define _XMLSEARCH_UTIL_DECOMPRESSOR_HXX_
-#ifndef INCLUDED_STL_VECTOR
#include vector
-#define INCLUDED_STL_VECTOR
-#endif
#include excep/XmlSearchExceptions.hxx
#include util/RandomAccessStream.hxx
-
namespace xmlsearch {
namespace util {
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx
b/xmlhelp/source/cxxhelp/provider/databases.hxx
index d9c333f..028fad1 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -29,14 +29,8 @@
#ifndef _DATABASES_HXX_
#define _DATABASES_HXX_
-#ifndef INCLUDED_STL_SET
#include set
-#define INCLUDED_STL_SET
-#endif
-#ifndef INCLUDED_STL_VECTOR
#include vector
-#define INCLUDED_STL_VECTOR
-#endif
#include boost/unordered_map.hpp
#include boost/unordered_set.hpp
#include osl/mutex.hxx
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
index c7cf7f6..98772c1 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
@@ -28,10 +28,7 @@
#ifndef _RESULTSETBASE_HXX
#define _RESULTSETBASE_HXX
-#ifndef INCLUDED_STL_VECTOR
#include vector
-#define INCLUDED_STL_VECTOR
-#endif
#include cppuhelper/weak.hxx
#include cppuhelper/interfacecontainer.hxx
#include com/sun/star/lang/XComponent.hpp
diff --git a/xmlhelp/source/treeview/tvread.hxx
b/xmlhelp/source/treeview/tvread.hxx
index 847e5fd..a6bd751 100644
--- a/xmlhelp/source/treeview/tvread.hxx
+++ b/xmlhelp/source/treeview/tvread.hxx
@@ -29,10 +29,7 @@
#ifndef _TREEVIEW_TVREAD_HXX_
#define _TREEVIEW_TVREAD_HXX_
-#ifndef INCLUDED_STL_VECTOR
#include vector
-#define INCLUDED_STL_VECTOR
-#endif
#include rtl/ref.hxx
#include rtl/ustring.hxx
#include ucbhelper/macros.hxx
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 24 commits - basegfx/source connectivity/source dbaccess/source desktop/source framework/source hwpfilter/source l10ntools/source sal/osl sal/workben scripting/source sc/sourc
basegfx/source/polygon/b2dpolypolygoncutter.cxx
| 24 --
connectivity/source/drivers/postgresql/pq_tools.cxx
|3 -
dbaccess/source/filter/xml/xmlStyleImport.cxx
|4 -
desktop/source/deployment/gui/dp_gui_updatedialog.cxx
|2
framework/source/helper/titlebarupdate.cxx
|2
framework/source/layoutmanager/uielement.cxx
|4 -
framework/source/uielement/statusbarmanager.cxx
| 17 ++-
framework/source/uielement/toolbarsmenucontroller.cxx
|2
hwpfilter/source/hwpreader.cxx
|5 --
l10ntools/source/export.cxx
|6 --
l10ntools/source/help/HelpLinker.cxx
|1
sal/osl/unx/module.c
|3 -
sal/workben/clipboardwben/testcopy/cbcpytest.cxx
|1
sc/source/core/data/dptabres.cxx
|7 --
sc/source/filter/excel/excform.cxx
|4 -
scripting/source/provider/ScriptImpl.hxx
|7 +-
scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
|2
scripting/source/runtimemgr/ScriptNameResolverImpl.hxx
|9 +--
scripting/source/runtimemgr/ScriptRuntimeManager.hxx
| 11 ++--
scripting/source/runtimemgr/StorageBridge.hxx
|7 +-
scripting/source/runtimemgr/StorageBridgeFactory.hxx
|3 -
sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
|2
sdext/source/presenter/PresenterPaneBorderPainter.cxx
|2
svtools/source/control/toolbarmenu.cxx
| 16 +-
testtools/source/performance/ubtest.cxx
|1
tools/source/fsys/dirent.cxx
|1
ucb/source/ucp/webdav/LockSequence.cxx
|2
vcl/win/source/window/salframe.cxx
|5 --
xmerge/source/activesync/XMergeFilter.cpp
|2
29 files changed, 37 insertions(+), 118 deletions(-)
New commits:
commit 41e8fe179f10f224433b26daba105ee92c661ac4
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Feb 21 20:47:54 2012 +0100
WaE: remove variable scope
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx
b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 00c5a0c..56aed72 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -862,11 +862,12 @@ void fillAttnum2attnameMap(
::rtl::OString extractSingleTableFromSelect( const OStringVector vec )
{
rtl::OString ret;
-size_t token = 0;
if( 0 == rtl_str_shortenedCompareIgnoreAsciiCase_WithLength(
vec[0].pData-buffer, vec[0].pData-length, select , 6 , 6 ) )
{
+size_t token = 0;
+
for( token = 1; token vec.size() ; token ++ )
{
if( 0 == rtl_str_shortenedCompareIgnoreAsciiCase_WithLength(
commit a3bf3451a9c7859848d02bc56a616df3f9adf0a4
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Feb 21 20:42:17 2012 +0100
WaE: arrayIndexOutOfBounds
diff --git a/testtools/source/performance/ubtest.cxx
b/testtools/source/performance/ubtest.cxx
index 87394c2..a8ca0e0 100644
--- a/testtools/source/performance/ubtest.cxx
+++ b/testtools/source/performance/ubtest.cxx
@@ -1121,7 +1121,6 @@ sal_Int32 TestImpl::run( const Sequence OUString
rArgs )
aArgs[6].pData,
aArgs[7].pData,
aArgs[8].pData,
-aArgs[9].pData,
};
out( \n executing: \uno );
commit 9d5bcff31cfc511bfead51ee1a743300c520b243
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Feb 21 20:32:24 2012 +0100
WaE: unreadVariable
diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c
index b88080b..ea41a7e 100644
--- a/sal/osl/unx/module.c
+++ b/sal/osl/unx/module.c
@@ -55,7 +55,6 @@ static sal_Bool getModulePathFromAddress(void * address,
rtl_String ** path) {
/* Bah, we do want to use dladdr here also on iOS, I think? */
#if !defined(NO_DL_FUNCTIONS) || defined(IOS)
#if defined(AIX)
-int i;
int size = 4 * 1024;
char *buf, *filename=NULL;
struct ld_info *lp;
@@ -63,7 +62,7 @@ static sal_Bool getModulePathFromAddress(void * address
[Libreoffice-commits] .: cppuhelper/inc cppu/inc registry/inc store/inc
cppu/inc/com/sun/star/uno/Any.h |4 ++--
cppu/inc/com/sun/star/uno/Reference.h|4 ++--
cppu/inc/com/sun/star/uno/Sequence.h |2 +-
cppu/inc/cppu/Shield.hxx |4 ++--
cppu/inc/typelib/typedescription.h | 12 ++--
cppu/inc/uno/any2.h |2 +-
cppu/inc/uno/environment.h |2 +-
cppu/inc/uno/environment.hxx |2 +-
cppu/inc/uno/mapping.hxx |4 ++--
cppuhelper/inc/cppuhelper/access_control.hxx |2 +-
registry/inc/registry/reflread.hxx |5 ++---
registry/inc/registry/reflwrit.hxx |2 +-
registry/inc/registry/registry.h |2 +-
registry/inc/registry/registry.hxx |2 +-
store/inc/store/store.h |2 +-
15 files changed, 25 insertions(+), 26 deletions(-)
New commits:
commit b1073d9fa264139333704f82553ade9979e2ca24
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Feb 21 23:16:31 2012 +0100
WaE: silence some documentation errors
diff --git a/cppu/inc/com/sun/star/uno/Any.h b/cppu/inc/com/sun/star/uno/Any.h
index f5f2f72..18ef5a5 100644
--- a/cppu/inc/com/sun/star/uno/Any.h
+++ b/cppu/inc/com/sun/star/uno/Any.h
@@ -126,7 +126,7 @@ public:
{ return * reinterpret_cast const Type * ( pType ); }
/** Gets the type of the set value.
-@return the UNacquired type description reference of the set value
+@return the unacquired type description reference of the set value
*/
inline typelib_TypeDescriptionReference * SAL_CALL getValueTypeRef() const
SAL_THROW(())
{ return pType; }
@@ -134,7 +134,7 @@ public:
/** Gets the type description of the set value. Provides ownership of the
type description!
Call an explicit typelib_typedescription_release() to release
afterwards.
-@param a pointer to type description pointer
+@param ppTypeDescr a pointer to type description pointer
*/
inline void SAL_CALL getValueTypeDescription( typelib_TypeDescription **
ppTypeDescr ) const SAL_THROW(())
{ ::typelib_typedescriptionreference_getDescription( ppTypeDescr,
pType ); }
diff --git a/cppu/inc/com/sun/star/uno/Reference.h
b/cppu/inc/com/sun/star/uno/Reference.h
index 7e75a65..50c7b77 100644
--- a/cppu/inc/com/sun/star/uno/Reference.h
+++ b/cppu/inc/com/sun/star/uno/Reference.h
@@ -105,14 +105,14 @@ public:
/** Equality operator: compares two interfaces
Checks if both references are null or refer to the same object.
-@param rRef another interface
+@param pInterface another interface
@return true if both references are null or refer to the same object,
false otherwise
*/
inline sal_Bool SAL_CALL operator == ( XInterface * pInterface ) const
SAL_THROW(());
/** Unequality operator: compares two interfaces
Checks if both references are null or refer to the same object.
-@param rRef another interface
+@param pInterface another interface
@return false if both references are null or refer to the same object,
true otherwise
*/
inline sal_Bool SAL_CALL operator != ( XInterface * pInterface ) const
SAL_THROW(());
diff --git a/cppu/inc/com/sun/star/uno/Sequence.h
b/cppu/inc/com/sun/star/uno/Sequence.h
index f12b7c1..380bcb7 100644
--- a/cppu/inc/com/sun/star/uno/Sequence.h
+++ b/cppu/inc/com/sun/star/uno/Sequence.h
@@ -115,7 +115,7 @@ public:
/** Constructor: Creates a copy of given elements.
-@param pElement an array of elements
+@param pElements an array of elements
@param len length of array
*/
inline Sequence( const E * pElements, sal_Int32 len );
diff --git a/cppu/inc/cppu/Shield.hxx b/cppu/inc/cppu/Shield.hxx
index 1e7221a..f425399 100644
--- a/cppu/inc/cppu/Shield.hxx
+++ b/cppu/inc/cppu/Shield.hxx
@@ -67,7 +67,7 @@ namespace cppu
/** Maps an any from the current to the thread-safe Environment, fills the
passed any.
@param any the any to be mapped
-@param the target any
+@param res the target any
@since UDK 3.2.7
*/
inline void shieldAny(cssu::Any const any, cssu::Any * res)
@@ -79,7 +79,7 @@ namespace cppu
/** Maps an any from the thread-safe Environment to the current one, fills
the passed any.
@param any the any to be mapped
-@param the target any
+@param res the target any
@since UDK 3.2.7
*/
inline void unshieldAny(cssu::Any const any, cssu::Any * res)
diff --git a/cppu/inc/typelib/typedescription.h
b/cppu/inc/typelib/typedescription.h
index 6494e7c..783e3ec 100644
--- a/cppu/inc/typelib/typedescription.h
+++ b/cppu/inc/typelib/typedescription.h
@@ -587,7 +587,7 @@ CPPU_DLLPUBLIC void SAL_CALL
typelib_typedescription_newUnion(
@param ppRet inout enum type description
@param pTypeName
[Libreoffice-commits] .: 3 commits - cppuhelper/inc sal/inc svx/inc svx/source sw/source unusedcode.easy vcl/aqua vcl/headless vcl/inc vcl/source vcl/unx vcl/win
cppuhelper/inc/cppuhelper/propshlp.hxx |6 +- cppuhelper/inc/cppuhelper/unourl.hxx |4 - sal/inc/osl/pipe_decl.hxx|2 sal/inc/osl/security_decl.hxx|2 sal/inc/osl/semaphor.hxx |2 sal/inc/osl/socket_decl.hxx |6 +- sal/inc/rtl/strbuf.hxx | 18 +++--- sal/inc/rtl/string.hxx |2 sal/inc/rtl/ustring.hxx |2 svx/inc/svx/insctrl.hxx |2 svx/inc/svx/ruler.hxx|1 svx/inc/svx/selctrl.hxx |2 svx/inc/svx/xmlsecctrl.hxx |1 svx/source/dialog/svxruler.cxx | 12 svx/source/stbctrls/insctrl.cxx | 12 svx/source/stbctrls/selctrl.cxx | 20 --- svx/source/stbctrls/xmlsecctrl.cxx |5 - sw/source/core/text/txtfly.cxx | 77 --- sw/source/core/text/txtfly.hxx |8 -- unusedcode.easy |7 -- vcl/aqua/source/gdi/salnativewidgets.cxx | 18 -- vcl/headless/svpinst.cxx | 23 vcl/inc/aqua/salgdi.h|3 - vcl/inc/headless/svpinst.hxx |1 vcl/inc/ios/salgdi.h |3 - vcl/inc/salgdi.hxx | 12 vcl/inc/unx/gtk/gtkgdi.hxx |3 - vcl/inc/win/salgdi.h |3 - vcl/source/gdi/salgdilayout.cxx | 17 - vcl/source/gdi/salnativewidgets-none.cxx | 22 --- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 21 --- vcl/unx/kde/salnativewidgets-kde.cxx | 27 - vcl/unx/kde4/KDESalGraphics.hxx | 12 vcl/win/source/gdi/salnativewidgets-luna.cxx | 22 --- 34 files changed, 22 insertions(+), 356 deletions(-) New commits: commit 22e96521da9614c07b75452dc27014aca079fbf1 Author: Thomas Arnhold tho...@arnhold.org Date: Wed Feb 22 00:50:56 2012 +0100 WaE: silence some documentation errors diff --git a/cppuhelper/inc/cppuhelper/propshlp.hxx b/cppuhelper/inc/cppuhelper/propshlp.hxx index 4b01126..1ed2f60 100644 --- a/cppuhelper/inc/cppuhelper/propshlp.hxx +++ b/cppuhelper/inc/cppuhelper/propshlp.hxx @@ -78,7 +78,7 @@ public: is getCount() -1, than it must be an indexed acces to the property array. @param pPropName is an out parameter filled with property name of the property with the handle nHandle. May be NULL. - @param rAttributes is an out parameter filled with attributes of the property with the + @param pAttributes is an out parameter filled with attributes of the property with the handle nHandle. May be NULL. @return True, if the handle exist, otherwise false. */ @@ -160,7 +160,7 @@ public: Otherwise it is a linear search through the array. @param pPropName is an out parameter filled with property name of the property with the handle nHandle. May be NULL. - @param rAttributes is an out parameter filled with attributes of the property with the + @param pAttributes is an out parameter filled with attributes of the property with the handle nHandle. May be NULL. @return True, if the handle exist, otherwise false. */ @@ -274,7 +274,7 @@ public: /** Insert an element in the container specified with the key. The position is not specified. @param rKey the id of the container. - @param rxIFacethe added interface. It is allowed to insert null or + @param r the added interface. It is allowed to insert null or the same pointer more than once. @return the new count of elements in the container. */ diff --git a/cppuhelper/inc/cppuhelper/unourl.hxx b/cppuhelper/inc/cppuhelper/unourl.hxx index 37801e3..3e3a615 100644 --- a/cppuhelper/inc/cppuhelper/unourl.hxx +++ b/cppuhelper/inc/cppuhelper/unourl.hxx @@ -88,7 +88,7 @@ public: /** Test whether the parameters contain a key. @param -A (case insensitive) key. +rKey A (case insensitive) key. @return True if the parameters contain a matching key/value pair. @@ -98,7 +98,7 @@ public: /** Return the parameter value for a key. @param -A (case insensitive) key. +rKey A (case insensitive) key. @return The (case sensitive) value associated with the given key, or an empty diff --git a/sal/inc/osl/pipe_decl.hxx b/sal/inc/osl/pipe_decl.hxx index b361440..084a61b 100644 --- a/sal/inc/osl/pipe_decl.hxx +++ b/sal/inc/osl/pipe_decl.hxx @@ -185,7 +185,7 @@ public
[Libreoffice-commits] .: sd/Library_sd.mk sd/source unusedcode.easy
sd/Library_sd.mk |1
sd/source/ui/framework/configuration/ConfigurationController.cxx |3
sd/source/ui/framework/factories/BasicPaneFactory.cxx| 34
sd/source/ui/framework/factories/BasicPaneFactory.hxx|4
sd/source/ui/inc/UpdateLockManager.hxx | 94 --
sd/source/ui/inc/ViewShellBase.hxx |4
sd/source/ui/view/PresentationViewShellBase.cxx |4
sd/source/ui/view/UpdateLockManager.cxx | 430
--
sd/source/ui/view/ViewShellBase.cxx | 24
unusedcode.easy |3
10 files changed, 3 insertions(+), 598 deletions(-)
New commits:
commit 8597f9874f23a1ecd6b8b556c147d156a398077f
Author: Thomas Arnhold tho...@arnhold.org
Date: Mon Feb 20 17:15:23 2012 +0100
unusedcode.easy: remove UpdateLockManager
Seems UpdateLockManager is dead. So cut it out.
Also mbFirstUpdateSeen had no effect.
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 849d0c6..2515633 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -449,7 +449,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/view/PresentationViewShellBase \
sd/source/ui/view/SlideSorterViewShellBase \
sd/source/ui/view/ToolBarManager \
-sd/source/ui/view/UpdateLockManager \
sd/source/ui/view/ViewClipboard \
sd/source/ui/view/ViewShellBase \
sd/source/ui/view/ViewShellHint \
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx
b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index f11c5bb..617de84 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -26,9 +26,7 @@
*
/
-
#include framework/ConfigurationController.hxx
-
#include framework/Configuration.hxx
#include framework/FrameworkHelper.hxx
#include ConfigurationUpdater.hxx
@@ -40,7 +38,6 @@
#include ChangeRequestQueueProcessor.hxx
#include ConfigurationClassifier.hxx
#include ViewShellBase.hxx
-#include UpdateLockManager.hxx
#include DrawController.hxx
#include com/sun/star/drawing/framework/XControllerManager.hpp
#include com/sun/star/util/XURLTransformer.hpp
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index a854237..2b6b9d6 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -133,9 +133,7 @@ BasicPaneFactory::BasicPaneFactory (
mxComponentContext(rxContext),
mxConfigurationControllerWeak(),
mpViewShellBase(NULL),
- mpPaneContainer(new PaneContainer),
- mbFirstUpdateSeen(false),
- mpUpdateLockManager()
+ mpPaneContainer(new PaneContainer)
{
}
@@ -199,7 +197,6 @@ void SAL_CALL BasicPaneFactory::initialize (const
SequenceAny aArguments)
(sal::static_int_castsal_uIntPtr(
xTunnel-getSomething(DrawController::getUnoTunnelId();
mpViewShellBase = pController-GetViewShellBase();
-mpUpdateLockManager = mpViewShellBase-GetUpdateLockManager();
}
catch(RuntimeException)
{}
@@ -400,35 +397,10 @@ void SAL_CALL BasicPaneFactory::releaseResource (
//= XConfigurationChangeListener ==
void SAL_CALL BasicPaneFactory::notifyConfigurationChange (
-const ConfigurationChangeEvent rEvent)
+const ConfigurationChangeEvent /* rEvent */ )
throw (RuntimeException)
{
-sal_Int32 nEventType = 0;
-rEvent.UserData = nEventType;
-switch (nEventType)
-{
-case gnConfigurationUpdateStartEvent:
-// Lock UI updates while we are switching the views except for
-// the first time after creation. Outherwise this leads to
-// problems after reload (missing resizes for the side panes).
-if (mbFirstUpdateSeen)
-{
-}
-else
-mbFirstUpdateSeen = true;
-break;
-
-case gnConfigurationUpdateEndEvent:
-// Unlock the update lock here when only the visibility of
-// windows but not the view shells displayed in them have
-// changed. Otherwise the UpdateLockManager takes care of
-// unlocking at the right time.
-if (mpUpdateLockManager.get() != NULL)
-{
-::osl::Guard ::osl::Mutex aGuard
(::osl::Mutex::getGlobalMutex());
-}
-break;
-}
+ // FIXME: nothing to do
}
diff --git a/sd/source/ui/framework/factories
[Libreoffice-commits] .: 5 commits - binfilter/bf_sw binfilter/inc
binfilter/bf_sw/source/core/bastyp/sw_calc.cxx |5 --
binfilter/bf_sw/source/core/tox/sw_toxhlp.cxx | 22 -
binfilter/bf_sw/source/core/unocore/sw_swunohelper.cxx |5 --
binfilter/bf_sw/source/ui/app/sw_docsh2.cxx|1
binfilter/inc/bf_sw/swunodef.hxx | 41 -
binfilter/inc/bf_sw/toxwrap.hxx| 17 +++
6 files changed, 23 insertions(+), 68 deletions(-)
New commits:
commit b42b9adeeda6e859943c7167dbc30f285e14d73e
Author: Thomas Arnhold tho...@arnhold.org
Date: Mon Feb 20 20:51:40 2012 +0100
remove now unused swunodef.hxx
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
index d586a99..4890880 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
@@ -64,7 +64,6 @@
#include usrfld.hxx
#include dbmgr.hxx
#include docfld.hxx
-#include swunodef.hxx
#include legacysmgr/legacy_binfilters_smgr.hxx
namespace binfilter {
diff --git a/binfilter/bf_sw/source/core/unocore/sw_swunohelper.cxx
b/binfilter/bf_sw/source/core/unocore/sw_swunohelper.cxx
index 13abcd7..267195f 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_swunohelper.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_swunohelper.cxx
@@ -55,7 +55,6 @@
#include bf_svtools/svstdarr.hxx
#include swunohelper.hxx
-#include swunodef.hxx
#include osl/diagnose.h
#include legacysmgr/legacy_binfilters_smgr.hxx
namespace binfilter {
diff --git a/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx
b/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx
index 4758125..9f8179a 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx
@@ -58,7 +58,6 @@
#include bf_so3/svstor.hxx
#include comphelper/classids.hxx
-#include swunodef.hxx
#include osl/diagnose.h
diff --git a/binfilter/inc/bf_sw/swunodef.hxx b/binfilter/inc/bf_sw/swunodef.hxx
deleted file mode 100644
index b3097f2..000
--- a/binfilter/inc/bf_sw/swunodef.hxx
+++ /dev/null
@@ -1,37 +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 _SWUNODEF_HXX
-#define _SWUNODEF_HXX
-namespace binfilter {
-
-#define STAR_REFERENCE(aType) ::com::sun::star::uno::Reference
::com::sun::star::aType
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sw/toxwrap.hxx b/binfilter/inc/bf_sw/toxwrap.hxx
index 3f5a219..19899c1 100644
--- a/binfilter/inc/bf_sw/toxwrap.hxx
+++ b/binfilter/inc/bf_sw/toxwrap.hxx
@@ -33,7 +33,6 @@
#include com/sun/star/lang/Locale.hpp
#include com/sun/star/uno/Reference.hxx
-#include swunodef.hxx
namespace com { namespace sun { namespace star {
namespace i18n {
class XExtendedIndexEntrySupplier;
commit 823b60e8435a1d9237c2bf9591e47f179060cce2
Author: Thomas Arnhold tho...@arnhold.org
Date: Mon Feb 20 20:47:08 2012 +0100
expand and remove macro STAR_REFERENCE
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
index c55379b..d586a99 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
@@ -265,7 +265,7 @@ static int
/*N*/ eLang != SvxLocaleToLanguage( pCharClass-getLocale() ) )
/*N*/ {
/*N*/ ::com::sun::star::lang::Locale aLocale( SvxCreateLocale( eLang ));
-/*N*/ STAR_REFERENCE( lang::XMultiServiceFactory ) xMSF(
+/*N*/ ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory xMSF(
/*N*/
::legacy_binfilters::getLegacyProcessServiceFactory() );
/*N*/ pCharClass = new CharClass( xMSF, aLocale );
/*N*/ pLclData = new
[Libreoffice-commits] .: vcl/source
vcl/source/gdi/outdev2.cxx | 24 +++-
1 file changed, 11 insertions(+), 13 deletions(-)
New commits:
commit 30869cdcf761fea01b80ff09d99fd25b9fd7ce39
Author: Thomas Arnhold tho...@arnhold.org
Date: Mon Feb 20 23:49:48 2012 +0100
vcl: TwoRect - SalTwoRect
diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index 1781655..6d8987e 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -78,8 +78,6 @@ DBG_NAMEEX( OutputDevice )
return; \
}
-#define TwoRect SalTwoRect
-
// -
// - externals -
// -
@@ -92,7 +90,7 @@ extern sal_uLong nVCLLut[ 256 ];
// ===
-sal_uLong ImplAdjustTwoRect( TwoRect rTwoRect, const Size rSizePix )
+sal_uLong ImplAdjustTwoRect( SalTwoRect rTwoRect, const Size rSizePix )
{
sal_uLong nMirrFlags = 0;
@@ -151,7 +149,7 @@ sal_uLong ImplAdjustTwoRect( TwoRect rTwoRect, const Size
rSizePix )
// ===
-void ImplAdjustTwoRect( TwoRect rTwoRect, const Rectangle rValidSrcRect )
+void ImplAdjustTwoRect( SalTwoRect rTwoRect, const Rectangle rValidSrcRect )
{
if( ( rTwoRect.mnSrcX rValidSrcRect.Left() ) || ( rTwoRect.mnSrcX =
rValidSrcRect.Right() ) ||
( rTwoRect.mnSrcY rValidSrcRect.Top() ) || ( rTwoRect.mnSrcY =
rValidSrcRect.Bottom() ) ||
@@ -192,7 +190,7 @@ void ImplAdjustTwoRect( TwoRect rTwoRect, const Rectangle
rValidSrcRect )
void OutputDevice::ImplDrawOutDevDirect( const OutputDevice* pSrcDev, void*
pVoidPosAry )
{
-TwoRect*pPosAry = (TwoRect*)pVoidPosAry;
+SalTwoRect*pPosAry = (SalTwoRect*)pVoidPosAry;
SalGraphics*pGraphics2;
if ( this == pSrcDev )
@@ -285,7 +283,7 @@ void OutputDevice::DrawOutDev( const Point rDestPt, const
Size rDestSize,
OUTDEV_INIT();
-TwoRect aPosAry;
+SalTwoRect aPosAry;
aPosAry.mnSrcWidth = ImplLogicWidthToDevicePixel( rSrcSize.Width() );
aPosAry.mnSrcHeight = ImplLogicHeightToDevicePixel( rSrcSize.Height() );
aPosAry.mnDestWidth = ImplLogicWidthToDevicePixel( rDestSize.Width() );
@@ -340,7 +338,7 @@ void OutputDevice::DrawOutDev( const Point rDestPt, const
Size rDestSize,
OUTDEV_INIT();
-TwoRect aPosAry;
+SalTwoRect aPosAry;
aPosAry.mnSrcX = rOutDev.ImplLogicXToDevicePixel( rSrcPt.X() );
aPosAry.mnSrcY = rOutDev.ImplLogicYToDevicePixel( rSrcPt.Y() );
aPosAry.mnSrcWidth = rOutDev.ImplLogicWidthToDevicePixel(
rSrcSize.Width() );
@@ -402,7 +400,7 @@ void OutputDevice::CopyArea( const Point rDestPt,
OUTDEV_INIT();
-TwoRect aPosAry;
+SalTwoRect aPosAry;
aPosAry.mnSrcWidth = ImplLogicWidthToDevicePixel( rSrcSize.Width() );
aPosAry.mnSrcHeight = ImplLogicHeightToDevicePixel( rSrcSize.Height() );
@@ -478,7 +476,7 @@ void OutputDevice::ImplDrawFrameDev( const Point rPt,
const Point rDevPt, cons
else
ImplSelectClipRegion( rRegion );
-TwoRect aPosAry;
+SalTwoRect aPosAry;
aPosAry.mnSrcX = rDevPt.X();
aPosAry.mnSrcY = rDevPt.Y();
aPosAry.mnSrcWidth = rDevSize.Width();
@@ -637,7 +635,7 @@ void OutputDevice::ImplDrawBitmap( const Point rDestPt,
const Size rDestSize,
if( !aBmp.IsEmpty() )
{
-TwoRect aPosAry;
+SalTwoRect aPosAry;
aPosAry.mnSrcX = rSrcPtPixel.X();
aPosAry.mnSrcY = rSrcPtPixel.Y();
@@ -884,7 +882,7 @@ void OutputDevice::ImplDrawBitmapEx( const Point rDestPt,
const Size rDestSize
if( !( !aBmpEx ) )
{
-TwoRect aPosAry;
+SalTwoRect aPosAry;
aPosAry.mnSrcX = rSrcPtPixel.X();
aPosAry.mnSrcY = rSrcPtPixel.Y();
@@ -1131,7 +1129,7 @@ void OutputDevice::ImplDrawMask( const Point rDestPt,
const Size rDestSize,
const ImpBitmap* pImpBmp = rBitmap.ImplGetImpBitmap();
if ( pImpBmp )
{
-TwoRect aPosAry;
+SalTwoRect aPosAry;
aPosAry.mnSrcX = rSrcPtPixel.X();
aPosAry.mnSrcY = rSrcPtPixel.Y();
@@ -1298,7 +1296,7 @@ Bitmap OutputDevice::GetBitmap( const Point rSrcPt,
const Size rSize ) const
{
if ( ((OutputDevice*)aVDev)-mpGraphics ||
((OutputDevice*)aVDev)-ImplGetGraphics() )
{
-TwoRect aPosAry;
+SalTwoRect aPosAry;
aPosAry.mnSrcX = nX;
aPosAry.mnSrcY = nY;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - svtools/inc svtools/source vcl/inc
svtools/inc/svtools/grfmgr.hxx|3 ---
svtools/source/graphic/grfmgr.cxx |6 --
vcl/inc/salframe.hxx | 10 --
3 files changed, 19 deletions(-)
New commits:
commit 02192b8366c9301ab168770963a88292f4051f52
Author: Thomas Arnhold tho...@arnhold.org
Date: Sun Feb 19 17:20:54 2012 +0100
svtools: remove unused GraphicObject::GetReleaseFromCache
diff --git a/svtools/inc/svtools/grfmgr.hxx b/svtools/inc/svtools/grfmgr.hxx
index 896a475..edb3db1 100644
--- a/svtools/inc/svtools/grfmgr.hxx
+++ b/svtools/inc/svtools/grfmgr.hxx
@@ -346,9 +346,6 @@ protected:
virtual voidGraphicManagerDestroyed();
virtual SvStream* GetSwapStream() const;
-// !!! to be removed
-virtual sal_uLong GetReleaseFromCache() const;
-
virtual voidLoad( SvStream );
virtual voidSave( SvStream );
virtual voidAssign( const SvDataCopyStream );
diff --git a/svtools/source/graphic/grfmgr.cxx
b/svtools/source/graphic/grfmgr.cxx
index 28fc1c9..7c2de86 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -393,12 +393,6 @@ SvStream* GraphicObject::GetSwapStream() const
return( HasSwapStreamHdl() ? (SvStream*) mpSwapStreamHdl-Call( (void*)
this ) : GRFMGR_AUTOSWAPSTREAM_NONE );
}
-// !!! to be removed
-sal_uLong GraphicObject::GetReleaseFromCache() const
-{
-return 0;
-}
-
void GraphicObject::SetAttr( const GraphicAttr rAttr )
{
maAttr = rAttr;
commit 2e54f4ff0fe12846a52d0cbbd3404f115d515811
Author: Thomas Arnhold tho...@arnhold.org
Date: Sun Feb 19 10:31:40 2012 +0100
vcl: dead code
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index f4c3d73..4c412b7 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -103,16 +103,6 @@ struct SystemEnvData;
// the window containing the intro bitmap, aka splashscreen
#define SAL_FRAME_STYLE_INTRO ((sal_uLong)0x8000)
-/*
-#define SAL_FRAME_STYLE_MINABLE ((sal_uLong)0x0008)
-#define SAL_FRAME_STYLE_MAXABLE ((sal_uLong)0x0010)
-#define SAL_FRAME_STYLE_BORDER ((sal_uLong)0x0040)
-#define SAL_FRAME_STYLE_DOC ((sal_uLong)0x4000)
-#define SAL_FRAME_STYLE_DIALOG ((sal_uLong)0x8000)
-#define SAL_FRAME_STYLE_TOOL((sal_uLong)0x0001)
-#define SAL_FRAME_STYLE_FULLSIZE((sal_uLong)0x0002)
-*/
-
//
// - extended frame style -
// - (sal equivalent to extended WinBits) -
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_goodies binfilter/inc
binfilter/bf_goodies/source/base2d/goodies_graphicobject.cxx |1 -
binfilter/inc/bf_goodies/graphicobject.hxx |1 -
2 files changed, 2 deletions(-)
New commits:
commit 2487d06a7f873a7a4a74d968e702152338d6ebfc
Author: Thomas Arnhold tho...@arnhold.org
Date: Sun Feb 19 19:50:48 2012 +0100
remove GetReleaseFromCache
diff --git a/binfilter/bf_goodies/source/base2d/goodies_graphicobject.cxx
b/binfilter/bf_goodies/source/base2d/goodies_graphicobject.cxx
index adcd27e..3cb549e 100644
--- a/binfilter/bf_goodies/source/base2d/goodies_graphicobject.cxx
+++ b/binfilter/bf_goodies/source/base2d/goodies_graphicobject.cxx
@@ -37,7 +37,6 @@ namespace binfilter {
namespace binfilter {
TYPEINIT1_AUTOFACTORY( BfGraphicObject, GraphicObject);
void BfGraphicObject::GraphicManagerDestroyed() {
GraphicObject::GraphicManagerDestroyed(); }
-ULONG BfGraphicObject::GetReleaseFromCache() const { return
GraphicObject::GetReleaseFromCache(); }
SvStream* BfGraphicObject::GetSwapStream() const { return
GraphicObject::GetSwapStream(); }
void BfGraphicObject::Load( SvStream rSt ) { GraphicObject::Load(rSt); }
void BfGraphicObject::Assign( const SvDataCopyStream rSt ) {
GraphicObject::Assign(rSt); }
diff --git a/binfilter/inc/bf_goodies/graphicobject.hxx
b/binfilter/inc/bf_goodies/graphicobject.hxx
index 6254e04..4aa803b 100644
--- a/binfilter/inc/bf_goodies/graphicobject.hxx
+++ b/binfilter/inc/bf_goodies/graphicobject.hxx
@@ -52,7 +52,6 @@ namespace binfilter {
{
protected:
virtual void GraphicManagerDestroyed();
-virtual ULONG GetReleaseFromCache() const;
virtual SvStream* GetSwapStream() const;
virtual void Load( SvStream );
virtual void Save( SvStream ) {};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - desktop/source smoketest/lodownloadtest.py unusedcode.easy
desktop/source/deployment/dp_services.cxx|3 -
desktop/source/deployment/manager/dp_extensionmanager.cxx| 22 --
desktop/source/deployment/manager/dp_informationprovider.cxx | 24 ---
desktop/source/deployment/manager/dp_managerfac.cxx | 22 --
smoketest/lodownloadtest.py |1
unusedcode.easy |2
6 files changed, 74 deletions(-)
New commits:
commit 8ecea48c050b77c86159ebdcb41096160ec6a090
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Feb 18 11:32:23 2012 +0100
unusedcode.easy: desktop: singleton_entries is completely unused
diff --git a/desktop/source/deployment/dp_services.cxx
b/desktop/source/deployment/dp_services.cxx
index 53cdd63..c0a44d8 100644
--- a/desktop/source/deployment/dp_services.cxx
+++ b/desktop/source/deployment/dp_services.cxx
@@ -66,10 +66,8 @@ extern sdecl::ServiceDecl const serviceDecl;
namespace dp_manager {
namespace factory {
extern sdecl::ServiceDecl const serviceDecl;
-bool singleton_entries( uno::Referenceregistry::XRegistryKey const );
}
extern sdecl::ServiceDecl const serviceDecl;
-bool singleton_entries( uno::Referenceregistry::XRegistryKey const );
}
namespace dp_log {
@@ -78,7 +76,6 @@ extern sdecl::ServiceDecl const serviceDecl;
namespace dp_info {
extern sdecl::ServiceDecl const serviceDecl;
-bool singleton_entries( uno::Referenceregistry::XRegistryKey const );
}
extern C {
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx
b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 4f0331a..d7654b6 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -1506,28 +1506,6 @@ extern sdecl::ServiceDecl const serviceDecl(
com.sun.star.comp.deployment.ExtensionManager,
com.sun.star.comp.deployment.ExtensionManager);
-//--
-bool singleton_entries(
-uno::Reference registry::XRegistryKey const xRegistryKey )
-{
-try {
-uno::Reference registry::XRegistryKey xKey(
-xRegistryKey-createKey(
-serviceDecl.getImplementationName() +
-// xxx todo: use future generated function to get singleton
name
-OUSTR(/UNO/SINGLETONS/
- com.sun.star.deployment.ExtensionManager) ) );
-xKey-setStringValue( serviceDecl.getSupportedServiceNames()[0] );
-return true;
-}
-catch (const registry::InvalidRegistryException exc) {
-(void) exc; // avoid warnings
-OSL_FAIL( ::rtl::OUStringToOString(
-exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
-return false;
-}
-}
-
// XModifyBroadcaster
//__
void ExtensionManager::addModifyListener(
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx
b/desktop/source/deployment/manager/dp_informationprovider.cxx
index dc879d1..14f5bfa 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -26,9 +26,7 @@
*
/
-
#include cppuhelper/implbase3.hxx
-
#include comphelper/servicedecl.hxx
#include com/sun/star/deployment/UpdateInformationProvider.hpp
@@ -338,28 +336,6 @@ extern sdecl::ServiceDecl const serviceDecl(
com.sun.star.comp.deployment.PackageInformationProvider,
com.sun.star.comp.deployment.PackageInformationProvider );
-//--
-bool singleton_entries(
-uno::Reference registry::XRegistryKey const xRegistryKey )
-{
-try {
-uno::Reference registry::XRegistryKey xKey(
-xRegistryKey-createKey(
-serviceDecl.getImplementationName() +
-// xxx todo: use future generated function to get singleton
name
-UNISTRING(/UNO/SINGLETONS/
- com.sun.star.deployment.PackageInformationProvider) )
);
-xKey-setStringValue( serviceDecl.getSupportedServiceNames()[0] );
-return true;
-}
-catch (registry::InvalidRegistryException exc) {
-(void) exc; // avoid warnings
-OSL_FAIL( ::rtl::OUStringToOString(
-exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
-return false;
-}
-}
-
} // namespace dp_info
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx
b/desktop/source/deployment/manager/dp_managerfac.cxx
index 701d1a6..9061f04 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -82,28 +82,6 @@ extern sdecl::ServiceDecl const
[Libreoffice-commits] .: 2 commits - vcl/inc vcl/source vcl/win
vcl/inc/outfont.hxx|3
vcl/source/gdi/outdev3.cxx | 77 +++-
vcl/win/source/gdi/salgdi3.cxx | 116 -
vcl/win/source/gdi/salprn.cxx |1
vcl/win/source/window/salframe.cxx | 19 --
5 files changed, 76 insertions(+), 140 deletions(-)
New commits:
commit f2601ba087d9d21af09134703b12de2a1d1763f8
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Feb 18 14:40:11 2012 +0100
remove some unused windows code
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 692005d..e3e94b4 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -1228,8 +1228,6 @@ sal_IntPtr ImplWinFontData::GetFontId() const
// ---
static unsigned GetUInt( const unsigned char* p ) {
return((p[0]24)+(p[1]16)+(p[2]8)+p[3]);}
-static unsigned GetUShort( const unsigned char* p ){ return((p[0]8)+p[1]);}
-//static signed GetSShort( const unsigned char* p ){
return((short)((p[0]8)+p[1]));}
static inline DWORD CalcTag( const char p[4]) { return
(p[0]+(p[1]8)+(p[2]16)+(p[3]24)); }
// ---
@@ -1807,120 +1805,6 @@ int CALLBACK SalEnumCharSetsProcExA( const
ENUMLOGFONTEXA* pLogFont,
// ---
-static void ImplGetAllFontCharSets( WinSalGraphics* pData )
-{
-if ( !pData-mpFontCharSets )
-pData-mpFontCharSets = new BYTE[256];
-
-LOGFONTA aLogFont;
-memset( aLogFont, 0, sizeof( aLogFont ) );
-aLogFont.lfCharSet = DEFAULT_CHARSET;
-GetTextFaceA( pData-mhDC, sizeof( aLogFont.lfFaceName ),
aLogFont.lfFaceName );
-EnumFontFamiliesExA( pData-mhDC, aLogFont,
(FONTENUMPROCA)SalEnumCharSetsProcExA,
- (LPARAM)(void*)pData, 0 );
-}
-
-// ---
-
-static void ImplAddKerningPairs( WinSalGraphics* pData )
-{
-sal_uLong nPairs = ::GetKerningPairsA( pData-mhDC, 0, NULL );
-if ( !nPairs )
-return;
-
-CHARSETINFO aInfo;
-if ( !TranslateCharsetInfo( (DWORD*)(sal_uLong)GetTextCharset( pData-mhDC
), aInfo, TCI_SRCCHARSET ) )
-return;
-
-if ( !pData-mpFontKernPairs )
-pData-mpFontKernPairs = new KERNINGPAIR[nPairs];
-else
-{
-KERNINGPAIR* pOldPairs = pData-mpFontKernPairs;
-pData-mpFontKernPairs = new
KERNINGPAIR[nPairs+pData-mnFontKernPairCount];
-memcpy( pData-mpFontKernPairs, pOldPairs,
-pData-mnFontKernPairCount*sizeof( KERNINGPAIR ) );
-delete[] pOldPairs;
-}
-
-UINTnCP = aInfo.ciACP;
-sal_uLong nOldPairs = pData-mnFontKernPairCount;
-KERNINGPAIR*pTempPair =
pData-mpFontKernPairs+pData-mnFontKernPairCount;
-nPairs = ::GetKerningPairsA( pData-mhDC, nPairs, pTempPair );
-for ( sal_uLong i = 0; i nPairs; i++ )
-{
-unsigned char aBuf[2];
-wchar_t nChar;
-int nLen;
-sal_BoolbAdd = TRUE;
-
-// None-ASCII?, then we must convert the char
-if ( (pTempPair-wFirst 125) || (pTempPair-wFirst == 92) )
-{
-if ( pTempPair-wFirst 256 )
-{
-aBuf[0] = (unsigned char)pTempPair-wFirst;
-nLen = 1;
-}
-else
-{
-aBuf[0] = (unsigned char)(pTempPair-wFirst 8);
-aBuf[1] = (unsigned char)(pTempPair-wFirst 0xFF);
-nLen = 2;
-}
-if ( MultiByteToWideChar( nCP, MB_PRECOMPOSED | MB_USEGLYPHCHARS,
- (const char*)aBuf, nLen, nChar, 1 ) )
-pTempPair-wFirst = nChar;
-else
-bAdd = FALSE;
-}
-if ( (pTempPair-wSecond 125) || (pTempPair-wSecond == 92) )
-{
-if ( pTempPair-wSecond 256 )
-{
-aBuf[0] = (unsigned char)pTempPair-wSecond;
-nLen = 1;
-}
-else
-{
-aBuf[0] = (unsigned char)(pTempPair-wSecond 8);
-aBuf[1] = (unsigned char)(pTempPair-wSecond 0xFF);
-nLen = 2;
-}
-if ( MultiByteToWideChar( nCP, MB_PRECOMPOSED | MB_USEGLYPHCHARS,
- (const char*)aBuf, nLen, nChar, 1 ) )
-pTempPair-wSecond = nChar;
-else
-bAdd = FALSE;
-}
-
-// TODO: get rid of linear search!
-KERNINGPAIR* pTempPair2 = pData-mpFontKernPairs;
-for ( sal_uLong j = 0; j nOldPairs; j++ )
-{
-if ( (pTempPair2-wFirst == pTempPair-wFirst)
- (pTempPair2-wSecond == pTempPair-wSecond) )
-{
-bAdd
[Libreoffice-commits] .: 2 commits - vcl/source
vcl/source/gdi/outdev3.cxx | 65 ++---
1 file changed, 4 insertions(+), 61 deletions(-)
New commits:
commit 77946f3b9d03e814f7ada8af7f633c649975659e
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Feb 18 14:49:39 2012 +0100
vcl: bring ImplFindByLocale back (windows build)
Sorry for this.
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 9acb296..75871da 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -228,6 +228,9 @@ public:
ImplGetDevFontList* GetDevFontList() const;
ImplGetDevSizeList* GetDevSizeList( const String rFontName ) const;
+//used by 2-level font fallback
+ImplDevFontListData* ImplFindByLocale( com::sun::star::lang::Locale )
const;
+
protected:
voidInitMatchData() const;
boolAreMapNamesAvailable() const { return mbMapNames; }
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 598823e..4c0123f 100755
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -1668,6 +1668,18 @@ void ImplDevFontList::InitMatchData() const
}
}
+//
+ImplDevFontListData* ImplDevFontList::ImplFindByLocale(
com::sun::star::lang::Locale rLocale ) const
+{
+// get the default font for a specified locale
+const DefaultFontConfiguration rDefaults =
DefaultFontConfiguration::get();
+const String aDefault = rDefaults.getUserInterfaceFont( rLocale );
+ImplDevFontListData* pFontData = ImplFindByTokenNames( aDefault );
+if( pFontData )
+return pFontData;
+return NULL;
+}
+
// ---
ImplDevFontListData* ImplDevFontList::ImplFindByAttributes( sal_uLong
nSearchType,
commit afdcc3c093da5cadb244d2d069e63db3b56a41fe
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Feb 18 14:44:41 2012 +0100
Revert vcl: bring ImplFindByLocale back (windows build)
This reverts commit 04af52609aef5b4ccbbf82553ac190ef43700652.
This was nothing...
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 75871da..9acb296 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -228,9 +228,6 @@ public:
ImplGetDevFontList* GetDevFontList() const;
ImplGetDevSizeList* GetDevSizeList( const String rFontName ) const;
-//used by 2-level font fallback
-ImplDevFontListData* ImplFindByLocale( com::sun::star::lang::Locale )
const;
-
protected:
voidInitMatchData() const;
boolAreMapNamesAvailable() const { return mbMapNames; }
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 6cd8e34..598823e 100755
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -26,8 +26,6 @@
*
/
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include precompiled_vcl.hxx
#include i18npool/mslangid.hxx
@@ -418,35 +416,6 @@ sal_uInt16 OutputDevice::GetFontSubstituteCount()
// ---
-void OutputDevice::GetFontSubstitute( sal_uInt16 n,
- XubString rFontName,
- XubString rReplaceFontName,
- sal_uInt16 rFlags )
-{
-const ImplDirectFontSubstitution* pSubst =
ImplGetSVData()-maGDIData.mpDirectFontSubst;
-if( pSubst )
-pSubst-GetFontSubstitute( n, rFontName, rReplaceFontName, rFlags );
-}
-
-// ---
-
-bool ImplDirectFontSubstitution::GetFontSubstitute( int nIndex,
-String rFontName, String rSubstFontName, sal_uInt16 rFlags ) const
-{
-FontSubstList::const_iterator it = maFontSubstList.begin();
-for( int nCount = 0; (it != maFontSubstList.end()) (nCount++ !=
nIndex); ++it ) ;
-if( it == maFontSubstList.end() )
-return false;
-
-const ImplFontSubstEntry* pEntry = (*it);
-rFontName = pEntry-maName;
-rSubstFontName = pEntry-maReplaceName;
-rFlags = pEntry-mnFlags;
-return true;
-}
-
-// ---
-
bool ImplDirectFontSubstitution::FindFontSubstitute( String rSubstName,
const String rSearchName, sal_uInt16 nFlags ) const
{
@@ -1699,18 +1668,6 @@ void ImplDevFontList::InitMatchData() const
}
}
-//
-ImplDevFontListData* ImplDevFontList::ImplFindByLocale(
com::sun::star::lang::Locale rLocale ) const
-{
-// get the default font for a specified locale
-const DefaultFontConfiguration rDefaults =
DefaultFontConfiguration::get();
-const String aDefault
[Libreoffice-commits] .: 19 commits - connectivity/source editeng/inc editeng/source framework/inc framework/source np_sdk/inc offapi/com offapi/UnoApi_offapi.mk qadevOOo/objdsc qadevOOo/tests registr
connectivity/source/drivers/ado/Aolevariant.cxx |4
editeng/inc/editeng/svxfont.hxx |3
editeng/source/items/svxfont.cxx | 31 --
framework/inc/macros/debug.hxx|8
framework/inc/macros/debug/timemeasure.hxx| 143
-
framework/inc/services/layoutmanager.hxx |6
framework/source/layoutmanager/layoutmanager.cxx | 14
np_sdk/inc/npapi.h|7
offapi/UnoApi_offapi.mk |1
offapi/com/sun/star/frame/LayoutManager.idl |7
offapi/com/sun/star/frame/XInplaceLayout.idl | 68
qadevOOo/objdsc/fwk/com.sun.star.comp.framework.LayoutManager.csv |2
qadevOOo/tests/java/ifc/frame/_XInplaceLayout.java| 48 ---
registry/inc/registry/registry.h | 29 -
registry/source/regkey.cxx| 38 --
sal/osl/w32/file_dirvol.cxx |1
sal/osl/w32/nlsupport.c | 18 -
sal/osl/w32/pipe.c|7
sal/osl/w32/profile.cxx | 148
--
sal/osl/w32/security.c|5
sw/source/filter/xml/xmltexti.hxx |1
unodevtools/source/skeletonmaker/javacompskeleton.cxx | 22 -
unusedcode.easy |1
vcl/generic/print/genpspgraphics.cxx |5
vcl/inc/win/saldata.hxx |1
vcl/win/source/gdi/salgdi2.cxx|1
vcl/win/source/gdi/salgdi3.cxx| 40 --
vcl/win/source/gdi/salnativewidgets-luna.cxx |7
xmloff/Package_inc.mk |1
xmloff/inc/functional.hxx | 30 --
xmloff/inc/xmloff/txtimp.hxx |3
xmloff/source/transform/MetaTContext.hxx |5
32 files changed, 15 insertions(+), 690 deletions(-)
New commits:
commit 5ca858c01cb2e2aa93c8aca65fd271a900785e3f
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Feb 18 21:29:58 2012 +0100
offapi: remove obsolete XInplaceLayout
diff --git a/framework/inc/services/layoutmanager.hxx
b/framework/inc/services/layoutmanager.hxx
index 84931a3..9c9d545 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -161,12 +161,6 @@ namespace framework
virtual sal_Bool SAL_CALL isVisible() throw
(::com::sun::star::uno::RuntimeException);
//-
-// XInplaceLayout
-
//-
-virtual void SAL_CALL setInplaceMenuBar( sal_Int64
pInplaceMenuBarPointer ) throw (::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL resetInplaceMenuBar( ) throw
(::com::sun::star::uno::RuntimeException);
-
-
//-
// XMenuBarMergingAcceptor
//-
virtual sal_Bool SAL_CALL setMergedMenuBar( const
::com::sun::star::uno::Reference ::com::sun::star::container::XIndexAccess
xMergedMenuBar )
diff --git a/framework/source/layoutmanager/layoutmanager.cxx
b/framework/source/layoutmanager/layoutmanager.cxx
index 0020a2e..63a1569 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -26,7 +26,6 @@
*
/
-
// my own includes
#include services/layoutmanager.hxx
#include helpers.hxx
@@ -34,7 +33,6 @@
#include services.h
#include framework/sfxhelperfunctions.hxx
-#include framework/sfxhelperfunctions.hxx
#include uielement/menubarwrapper.hxx
#include framework/addonsoptions.hxx
#include uiconfiguration/windowstateconfiguration.hxx
@@ -1244,18 +1242,6 @@ throw (RuntimeException)
implts_reset( sal_True );
}
-void SAL_CALL LayoutManager::setInplaceMenuBar( sal_Int64 )
-throw (uno::RuntimeException)
-{
-OSL_FAIL( This method is obsolete and should not be used!\n );
-}
-
-void SAL_CALL LayoutManager
[Libreoffice-commits] .: registry/util
registry/util/reg.map |3 ---
1 file changed, 3 deletions(-)
New commits:
commit f081f1be7ead2beff742eccf9955ebd9437203f8
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Feb 18 22:03:04 2012 +0100
registry: remove symbols from map file
diff --git a/registry/util/reg.map b/registry/util/reg.map
index 92913e7..b0eee61 100644
--- a/registry/util/reg.map
+++ b/registry/util/reg.map
@@ -20,10 +20,7 @@ UDK_3_0_0 {
reg_getStringListValue;
reg_getUnicodeListValue;
reg_freeValueList;
-reg_createLink;
-reg_deleteLink;
reg_getKeyType;
-reg_getLinkTarget;
reg_getResolvedKeyName;
reg_loadKey;
reg_saveKey;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: framework/inc framework/source offapi/com offapi/UnoApi_offapi.mk qadevOOo/objdsc qadevOOo/tests
framework/inc/services/layoutmanager.hxx |6
framework/source/layoutmanager/layoutmanager.cxx | 14 ++
offapi/UnoApi_offapi.mk |1
offapi/com/sun/star/frame/LayoutManager.idl |7 +
offapi/com/sun/star/frame/XInplaceLayout.idl | 68
++
qadevOOo/objdsc/fwk/com.sun.star.comp.framework.LayoutManager.csv |2
qadevOOo/tests/java/ifc/frame/_XInplaceLayout.java| 48
+++
7 files changed, 146 insertions(+)
New commits:
commit 10e580c57b907420e8c6d816325445a40a720e4a
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Feb 18 22:16:30 2012 +0100
Revert offapi: remove obsolete XInplaceLayout
This reverts commit 5ca858c01cb2e2aa93c8aca65fd271a900785e3f.
This change implicates some more changes in layoutmanager.hxx
see ::cppu::WeakImplHelper8. So keep it...
diff --git a/framework/inc/services/layoutmanager.hxx
b/framework/inc/services/layoutmanager.hxx
index 9c9d545..84931a3 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -161,6 +161,12 @@ namespace framework
virtual sal_Bool SAL_CALL isVisible() throw
(::com::sun::star::uno::RuntimeException);
//-
+// XInplaceLayout
+
//-
+virtual void SAL_CALL setInplaceMenuBar( sal_Int64
pInplaceMenuBarPointer ) throw (::com::sun::star::uno::RuntimeException);
+virtual void SAL_CALL resetInplaceMenuBar( ) throw
(::com::sun::star::uno::RuntimeException);
+
+
//-
// XMenuBarMergingAcceptor
//-
virtual sal_Bool SAL_CALL setMergedMenuBar( const
::com::sun::star::uno::Reference ::com::sun::star::container::XIndexAccess
xMergedMenuBar )
diff --git a/framework/source/layoutmanager/layoutmanager.cxx
b/framework/source/layoutmanager/layoutmanager.cxx
index 63a1569..0020a2e 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -26,6 +26,7 @@
*
/
+
// my own includes
#include services/layoutmanager.hxx
#include helpers.hxx
@@ -33,6 +34,7 @@
#include services.h
#include framework/sfxhelperfunctions.hxx
+#include framework/sfxhelperfunctions.hxx
#include uielement/menubarwrapper.hxx
#include framework/addonsoptions.hxx
#include uiconfiguration/windowstateconfiguration.hxx
@@ -1242,6 +1244,18 @@ throw (RuntimeException)
implts_reset( sal_True );
}
+void SAL_CALL LayoutManager::setInplaceMenuBar( sal_Int64 )
+throw (uno::RuntimeException)
+{
+OSL_FAIL( This method is obsolete and should not be used!\n );
+}
+
+void SAL_CALL LayoutManager::resetInplaceMenuBar()
+throw (uno::RuntimeException)
+{
+OSL_FAIL( This method is obsolete and should not be used!\n );
+}
+
//-
// XMenuBarMergingAcceptor
//-
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index b5a696a..1220adc 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -2516,6 +2516,7 @@ $(eval $(call
gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/frame,\
XFrameSetModel \
XFrames \
XFramesSupplier \
+ XInplaceLayout \
XInterceptorInfo \
XLayoutManager \
XLayoutManagerEventBroadcaster \
diff --git a/offapi/com/sun/star/frame/LayoutManager.idl
b/offapi/com/sun/star/frame/LayoutManager.idl
index 9e30376..aee70e7 100644
--- a/offapi/com/sun/star/frame/LayoutManager.idl
+++ b/offapi/com/sun/star/frame/LayoutManager.idl
@@ -32,6 +32,7 @@
#include com/sun/star/frame/XLayoutManager.idl
#include com/sun/star/frame/XFrameActionListener.idl
#include com/sun/star/ui/XUIConfigurationListener.idl
+#include com/sun/star/frame/XInplaceLayout.idl
#include com/sun/star/beans/XPropertySet.idl
#include com/sun/star/frame/XMenuBarMergingAcceptor.idl
#include com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
@@ -99,6 +100,12 @@ service LayoutManager
*/
[optional] interface
::com::sun::star::frame::XLayoutManagerEventBroadcaster;
+/** interface to support settings a menu bar for inplace editing of
+components inside OpenOffice.org.
+
+@deprecated
[Libreoffice-commits] .: sw/source
sw/source/core/text/txtfly.cxx | 64 -
sw/source/core/text/txtfrm.cxx | 39
2 files changed, 103 deletions(-)
New commits:
commit 3bbb62f09fef9d8526ef6d4bdacc55def952963a
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Feb 14 13:38:59 2012 +0100
sw: dead code removal
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 7a7ddf5..c2695f9 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -121,8 +121,6 @@ void SwTxtFormatter::CalcUnclipped( SwTwips rTop, SwTwips
rBottom )
SwTxtFormatter::CalcUnclipped with unswapped frame );
long nFlyAsc, nFlyDesc;
-// OD 08.01.2004 #i11859# - use new method
SwLineLayout::MaxAscentDescent(..)
-//lcl_MaxAscDescent( pCurr, rTop, rBottom, nFlyAsc, nFlyDesc );
pCurr-MaxAscentDescent( rTop, rBottom, nFlyAsc, nFlyDesc );
rTop = Y() + GetCurr()-GetAscent();
rBottom = rTop + nFlyDesc;
@@ -156,8 +154,6 @@ void SwTxtFormatter::UpdatePos( SwLineLayout *pCurrent,
Point aStart,
aTmpInf.SetPos( aStart );
long nTmpAscent, nTmpDescent, nFlyAsc, nFlyDesc;
-// OD 08.01.2004 #i11859# - use new method
SwLineLayout::MaxAscentDescent(..)
-//lcl_MaxAscDescent( pPos, nTmpAscent, nTmpDescent, nFlyAsc, nFlyDesc );
pCurrent-MaxAscentDescent( nTmpAscent, nTmpDescent, nFlyAsc, nFlyDesc );
KSHORT nTmpHeight = pCurrent-GetRealHeight();
@@ -195,9 +191,6 @@ void SwTxtFormatter::UpdatePos( SwLineLayout *pCurrent,
Point aStart,
if( ( pPos-IsFlyCntPortion() || pPos-IsGrfNumPortion() )
( bAllWays || !IsQuick() ) )
{
-// OD 08.01.2004 #i11859# - use new method
SwLineLayout::MaxAscentDescent(..)
-//lcl_MaxAscDescent( pFirst, nTmpAscent, nTmpDescent,
-// nFlyAsc, nFlyDesc, pPos );
pCurrent-MaxAscentDescent( nTmpAscent, nTmpDescent, nFlyAsc,
nFlyDesc, pPos );
if( pPos-IsGrfNumPortion() )
@@ -290,9 +283,6 @@ void SwTxtFormatter::AlignFlyInCntBase( long nBaseLine )
const
{
if( pPos-IsFlyCntPortion() || pPos-IsGrfNumPortion() )
{
-// OD 08.01.2004 #i11859# - use new method
SwLineLayout::MaxAscentDescent(..)
-//lcl_MaxAscDescent( pFirst, nTmpAscent, nTmpDescent,
-// nFlyAsc, nFlyDesc, pPos );
pCurr-MaxAscentDescent( nTmpAscent, nTmpDescent, nFlyAsc,
nFlyDesc, pPos );
if( pPos-IsGrfNumPortion() )
@@ -963,8 +953,6 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo rInf )
const SwFmtSurround rSur = pFmt-GetSurround();
const SwFmtAnchor rAnchor = pFmt-GetAnchor();
//Nur undurchsichtige und weiter oben liegende.
-/// OD 08.10.2002 #103898# - add condition
-/// !(pFly-IsBackgroundTransparent() ||
pFly-IsShadowTransparent())
if( !( pFly-IsBackgroundTransparent()
|| pFly-IsShadowTransparent() )
SURROUND_THROUGHT == rSur.GetSurround()
@@ -1203,13 +1191,6 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject*
_pAnchoredObj,
// anchored objects to one in the page header/footer and
// the document body -- content of
at-paragraph/at-character
// anchored objects doesn't wrap around each other.
-//else if( bInFooterOrHeader )
-//return sal_False; // In header or footer no wrapping
-// // if both bounded at paragraph
-//else // Zwei Flies mit (auto-)absatzgebunder Verankerung
...
-//// ... entscheiden nach der Reihenfolge ihrer Anker im
Dok.
-// bEvade = rNewA.GetCntntAnchor()-nNode.GetIndex() =
-// rCurrA.GetCntntAnchor()-nNode.GetIndex();
else
return sal_False;
}
@@ -1451,51 +1432,6 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList()
// If objects on the same position are found, they are sorted
// on its width.
// #i68520#
-//sal_uInt16 nPos = pFlyList-Count();
-//while ( nPos )
-//{
-//SdrObject* pTmpObj = (*pFlyList)[ --nPos ];
-//const SwRect aBoundRectOfTmpObj( GetBoundRect( pTmpObj )
);
-//if ( ( bR2L
-// ( (aBoundRectOfTmpObj.*fnRect-fnGetRight)() ==
-// (aBound.*fnRect-fnGetRight)() ) ) ||
-// ( !bR2L
-// ( (aBoundRectOfTmpObj.*fnRect-fnGetLeft)() ==
-// (aBound.*fnRect-fnGetLeft
[Libreoffice-commits] .: 7 commits - basic/source odk/settings readlicense_oo/docs salhelper/test solenv/inc svl/inc
basic/source/sbx/sbxvalue.cxx | 23 ---
odk/settings/settings.mk| 10 --
readlicense_oo/docs/readme.dtd |3 +--
salhelper/test/rtti/makefile.mk |6 --
solenv/inc/doxygen.cfg |2 --
solenv/inc/tg_compv.mk |5 -
svl/inc/svl/svarray.hxx |7 ---
7 files changed, 1 insertion(+), 55 deletions(-)
New commits:
commit 9b3372d8f0d59c8bf6789974d04733dff30bd131
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Feb 14 14:37:25 2012 +0100
Remove some more outdated sunpro traces
On Solaris gcc should be used. See:
514cefbcb7b800f8ddd2aa595502f4fe8403882f
19480ddf483174e956bd658b76380dbe499678dd
diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx
index 6907497..d500ca6 100644
--- a/svl/inc/svl/svarray.hxx
+++ b/svl/inc/svl/svarray.hxx
@@ -738,12 +738,6 @@ SV_IMPL_VARARR(nm##_SAR, AE)\
_SV_IMPL_SORTAR_ALG( nm,AE )\
_SV_SEEK_OBJECT( nm,AE )
-#if defined(C40) || defined(C41) || defined(C42) || defined(C50)
-#define C40_INSERT( c, p, n) Insert( (c const *) p, n )
-#define C40_PTR_INSERT( c, p) Insert( (c const *) p )
-#define C40_REPLACE( c, p, n) Replace( (c const *) p, n )
-#define C40_GETPOS( c, r) GetPos( (c const *)r )
-#else
#if defined(ICC) || defined(GCC) || (defined(WNT) _MSC_VER = 1400)
#define C40_INSERT( c, p, n ) Insert( (c const *) p, n )
#define C40_PTR_INSERT( c, p ) Insert( (c const *) p )
@@ -755,7 +749,6 @@ _SV_SEEK_OBJECT( nm,AE )
#define C40_REPLACE( c, p, n ) Replace( p, n )
#define C40_GETPOS( c, r) GetPos( r )
#endif
-#endif
#endif //_SVARRAY_HXX
commit 5cf9115058beab8e1179d55f0edca5d32e6aaa31
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Feb 14 14:32:28 2012 +0100
move CVER traces (sunpro compiler)
diff --git a/readlicense_oo/docs/readme.dtd b/readlicense_oo/docs/readme.dtd
index f893d54..d404451 100755
--- a/readlicense_oo/docs/readme.dtd
+++ b/readlicense_oo/docs/readme.dtd
@@ -14,7 +14,7 @@
gui (all | UNX | WNT) all
os (none | all | SOLARIS | LINUX | WNT | MACOSX) all
cpuname (all | SPARC | INTEL | POWERPC) all
- com (all | C50 | C52 | GCC | MSC) all
+ com (all | GCC | MSC) all
localized (true | false) true
style (P | H1 | H2 | H3 | HR) P
@@ -30,4 +30,4 @@
!ELEMENT List (Text | Paragraph)+
!ATTLIST List
Enum (true | false) false
-
\ No newline at end of file
+
commit 72e04abea5b881f29c63bc4beaf48bddabe39a15
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Feb 14 14:30:43 2012 +0100
remove sunpro 5.0 handling
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index f4aab28..be36119 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -205,32 +205,9 @@ SbxValue SbxValue::operator=( const SbxValue r )
SbxValue::~SbxValue()
{
-#ifndef C50
Broadcast( SBX_HINT_DYING );
SetFlag( SBX_WRITE );
SbxValue::Clear();
-#else
-// Provisional fix for the Solaris 5.0 compiler bbug
-// at using virtual inheritance. Avoid virtual calls
-// in the destructor. Instead of calling clear()
-// de-allocate posible object references direct.
-if( aData.eType == SbxOBJECT )
-{
-if( aData.pObj aData.pObj != this )
-{
-HACK(nicht bei Parent-Prop - sonst CyclicRef)
-SbxVariable *pThisVar = PTR_CAST(SbxVariable, this);
-sal_Bool bParentProp = pThisVar 5345 ==
-( (sal_Int16) ( pThisVar-GetUserData() 0x ) );
-if ( !bParentProp )
-aData.pObj-ReleaseRef();
-}
-}
-else if( aData.eType == SbxDECIMAL )
-{
-releaseDecimalPtr( aData.pDecimal );
-}
-#endif
}
void SbxValue::Clear()
commit 104613ffb7e94a421994977ebcb85d142ad64a9f
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Feb 14 14:28:35 2012 +0100
Remove CVER traces
see 08d49db2aac06ddc9d8c8ad7f34bee3a899e2fa9
diff --git a/solenv/inc/doxygen.cfg b/solenv/inc/doxygen.cfg
index 7aa1548..b1a443a 100644
--- a/solenv/inc/doxygen.cfg
+++ b/solenv/inc/doxygen.cfg
@@ -1059,10 +1059,8 @@ PREDEFINED = LINUX \
UNX \
VCL \
GCC \
- C341 \
X86_64 \
_DEBUG_RUNTIME \
- VER=C341 \
NPTL \
GLIBC=2 \
NEW_SOLAR \
commit 61ebddf9f41073b2b9b41dae0862d40d0018a6bf
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Feb 14 14:20:31 2012 +0100
salhelper: remove unexisting maps
diff --git a/salhelper/test/rtti/makefile.mk b/salhelper/test/rtti/makefile.mk
index b835780..e87182c 100644
--- a/salhelper/test/rtti/makefile.mk
+++ b/salhelper/test/rtti/makefile.mk
@@ -73,10 +73,6 @@ DEF1NAME=$(SHL1TARGET)
.IF $(OS)$(CPU)==SOLARISS
SHL1VERSIONMAP
[Libreoffice-commits] .: 2 commits - l10ntools/source unusedcode.easy vcl/unx
l10ntools/source/gsicheck.cxx |2 +-
unusedcode.easy |2 --
vcl/unx/gtk/gdi/gtkprintwrapper.cxx | 26 --
vcl/unx/gtk/inc/gtkprintwrapper.hxx |6 --
4 files changed, 1 insertion(+), 35 deletions(-)
New commits:
commit 00b070ff1478bbae773193e921c77466d8b895f7
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Feb 11 17:07:00 2012 +0100
l10ntools: use correct string literal for ssize_t
diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx
index 11c9d83..76b7928 100644
--- a/l10ntools/source/gsicheck.cxx
+++ b/l10ntools/source/gsicheck.cxx
@@ -75,7 +75,7 @@ void PrintMessage( rtl::OString const aType, rtl::OString
const aMsg, rtl::O
rtl::OString const aContext, sal_Bool bPrintContext,
std::size_t nLine, rtl::OString aUniqueId = rtl::OString() )
/*/
{
-fprintf( stdout, %s %s, Line %lu, aType.getStr(), aPrefix.getStr(),
nLine );
+fprintf( stdout, %s %s, Line %zu, aType.getStr(), aPrefix.getStr(),
nLine );
if ( !aUniqueId.isEmpty() )
fprintf( stdout, , UniqueID %s, aUniqueId.getStr() );
fprintf( stdout, : %s, aMsg.getStr() );
commit 839cf2fa8cd7ea30ad5be7124cd1b26779145406
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Feb 11 16:20:45 2012 +0100
unusedcode.easy: clean GtkPrintWrapper
diff --git a/unusedcode.easy b/unusedcode.easy
index 0b128a6..ff05025 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1495,5 +1495,3 @@ vcl::PDFExtOutDevData::SetOutlineItemDest(int, int)
vcl::PDFExtOutDevData::SetOutlineItemParent(int, int)
vcl::PDFExtOutDevData::SetOutlineItemText(int, rtl::OUString const)
vcl::PDFWriter::DrawPixel(Polygon const, Color const*)
-vcl::unx::GtkPrintWrapper::print_operation_set_has_selection(_GtkPrintOperation*,
int) const
-vcl::unx::GtkPrintWrapper::print_operation_set_support_selection(_GtkPrintOperation*,
int) const
diff --git a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx
b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx
index 6ecfd1d..904b47b 100644
--- a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx
+++ b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx
@@ -58,8 +58,6 @@ GtkPrintWrapper::GtkPrintWrapper()
, m_print_unix_dialog_set_manual_capabilities(0)
, m_print_unix_dialog_get_settings(0)
, m_print_unix_dialog_set_settings(0)
-, m_print_operation_set_support_selection(0)
-, m_print_operation_set_has_selection(0)
, m_print_unix_dialog_set_support_selection(0)
, m_print_unix_dialog_set_has_selection(0)
{
@@ -105,8 +103,6 @@ void GtkPrintWrapper::impl_load()
m_print_unix_dialog_set_manual_capabilities =
reinterpret_castprint_unix_dialog_set_manual_capabilities_t(m_aModule.getFunctionSymbol(gtk_print_unix_dialog_set_manual_capabilities));
m_print_unix_dialog_get_settings =
reinterpret_castprint_unix_dialog_get_settings_t(m_aModule.getFunctionSymbol(gtk_print_unix_dialog_get_settings));
m_print_unix_dialog_set_settings =
reinterpret_castprint_unix_dialog_set_settings_t(m_aModule.getFunctionSymbol(gtk_print_unix_dialog_set_settings));
-m_print_operation_set_support_selection =
reinterpret_castprint_operation_set_support_selection_t(m_aModule.getFunctionSymbol(gtk_print_operation_set_support_selection));
-m_print_operation_set_has_selection =
reinterpret_castprint_operation_set_has_selection_t(m_aModule.getFunctionSymbol(gtk_print_operation_set_has_selection));
m_print_unix_dialog_set_support_selection =
reinterpret_castprint_unix_dialog_set_support_selection_t(m_aModule.getFunctionSymbol(gtk_print_unix_dialog_set_support_selection));
m_print_unix_dialog_set_has_selection =
reinterpret_castprint_unix_dialog_set_has_selection_t(m_aModule.getFunctionSymbol(gtk_print_unix_dialog_set_has_selection));
}
@@ -145,8 +141,6 @@ bool GtkPrintWrapper::supportsPrintSelection() const
#if !GTK_CHECK_VERSION(3,0,0)
return
supportsPrinting()
- m_print_operation_set_support_selection
- m_print_operation_set_has_selection
m_print_unix_dialog_set_support_selection
m_print_unix_dialog_set_has_selection
;
@@ -325,26 +319,6 @@ void
GtkPrintWrapper::print_unix_dialog_set_settings(GtkPrintUnixDialog* dialog,
#endif
}
-void GtkPrintWrapper::print_operation_set_support_selection(GtkPrintOperation*
op, gboolean support_selection) const
-{
-#if !GTK_CHECK_VERSION(3,0,0)
-assert(m_print_operation_set_support_selection);
-(*m_print_operation_set_support_selection)(op, support_selection);
-#else
-gtk_print_operation_set_support_selection(op, support_selection);
-#endif
-}
-
-void GtkPrintWrapper::print_operation_set_has_selection(GtkPrintOperation* op,
gboolean has_selection) const
-{
-#if !GTK_CHECK_VERSION(3,0,0)
-assert(m_print_operation_set_has_selection);
-(*m_print_operation_set_has_selection)(op, has_selection);
-#else
[Libreoffice-commits] .: unusedcode.easy vcl/inc vcl/source
unusedcode.easy |5
vcl/inc/vcl/arrange.hxx | 72
vcl/source/window/arrange.cxx | 252 --
3 files changed, 329 deletions(-)
New commits:
commit b3776dfe6c41ac0a9855c650c3ef4811002426a4
Author: Thomas Arnhold tho...@arnhold.org
Date: Sun Feb 12 05:00:50 2012 +0100
unusedcode.easy: remove MatrixArranger
diff --git a/unusedcode.easy b/unusedcode.easy
index ff05025..6567bbc 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1482,12 +1482,7 @@
ucbhelper::SimpleCertificateValidationRequest::getResponse() const
utl::OConfigurationNode::appendNode(rtl::OUString const,
utl::OConfigurationNode const) const
utl::TransliterationWrapper::compareSubstring(String const, int, int, String
const, int, int) const
vcl::I18nHelper::GetDate(Date const) const
-vcl::LabeledElement::setLabel(boost::shared_ptrvcl::WindowArranger const)
vcl::LazyDeletorMenu::is_less(Menu*, Menu*)
-vcl::MatrixArranger::addChild(boost::shared_ptrvcl::WindowArranger const,
unsigned int, unsigned int, int)
-vcl::MatrixArranger::addWindow(Window*, unsigned int, unsigned int, int, Size
const)
-vcl::MatrixArranger::remove(Window*)
-vcl::MatrixArranger::remove(boost::shared_ptrvcl::WindowArranger const)
vcl::PDFExtOutDevData::EndGroup()
vcl::PDFExtOutDevData::GetFormsFormat() const
vcl::PDFExtOutDevData::SetAutoAdvanceTime(unsigned int, int)
diff --git a/vcl/inc/vcl/arrange.hxx b/vcl/inc/vcl/arrange.hxx
index 46df6af..2197f10 100644
--- a/vcl/inc/vcl/arrange.hxx
+++ b/vcl/inc/vcl/arrange.hxx
@@ -292,7 +292,6 @@ namespace vcl
virtual size_t countElements() const { return 2; }
void setLabel( Window* );
-void setLabel( boost::shared_ptrWindowArranger const );
void setElement( Window* );
void setElement( boost::shared_ptrWindowArranger const );
void setLabelColumnWidth( long i_nWidth )
@@ -381,77 +380,6 @@ namespace vcl
virtual bool isVisible() const { return true; }
};
-class VCL_DLLPUBLIC MatrixArranger : public WindowArranger
-{
-longm_nBorderX;
-longm_nBorderY;
-
-struct MatrixElement : public WindowArranger::Element
-{
-sal_uInt32 m_nX;
-sal_uInt32 m_nY;
-
-MatrixElement()
-: WindowArranger::Element()
-, m_nX( 0 )
-, m_nY( 0 )
-{}
-
-MatrixElement( Window* i_pWin,
- sal_uInt32 i_nX, sal_uInt32 i_nY,
- boost::shared_ptrWindowArranger const i_pChild
= boost::shared_ptrWindowArranger(),
- sal_Int32 i_nExpandPriority = 0,
- const Size i_rMinSize = Size()
- )
-: WindowArranger::Element( i_pWin, i_pChild, i_nExpandPriority,
i_rMinSize )
-, m_nX( i_nX )
-, m_nY( i_nY )
-{
-}
-};
-
-std::vector MatrixElement m_aElements;
-std::map sal_uInt64, size_t m_aMatrixMap; // maps (x | (y
32)) to index in m_aElements
-
-sal_uInt64 getMap( sal_uInt32 i_nX, sal_uInt32 i_nY )
-{ return static_cast sal_uInt64 (i_nX) | (static_cast
sal_uInt64(i_nY) 32 ); }
-
-static void distributeExtraSize( std::vectorlong io_rSizes, const
std::vectorsal_Int32 i_rPrios, long i_nExtraWidth );
-
-Size getOptimalSize( WindowSizeType,
- std::vectorlong o_rColumnWidths,
std::vectorlong o_rRowHeights,
- std::vectorsal_Int32 o_rColumnPrio,
std::vectorsal_Int32 o_rRowPrio
-) const;
-protected:
-virtual Element* getElement( size_t i_nIndex )
-{ return i_nIndex m_aElements.size() ? m_aElements[ i_nIndex ] : 0;
}
-
-public:
-MatrixArranger( WindowArranger* i_pParent = NULL,
-long i_nBorderX = -1,
-long i_nBorderY = -1 )
-: WindowArranger( i_pParent )
-, m_nBorderX( i_nBorderX )
-, m_nBorderY( i_nBorderY )
-{}
-
-virtual ~MatrixArranger();
-
-virtual Size getOptimalSize( WindowSizeType ) const;
-virtual void resize();
-virtual size_t countElements() const { return m_aElements.size(); }
-
-// add a managed window at the given matrix position
-size_t addWindow( Window*, sal_uInt32 i_nX, sal_uInt32 i_nY, sal_Int32
i_nExpandPrio = 0, const Size i_rMinSize = Size() );
-void remove( Window* );
-
-size_t addChild( boost::shared_ptrWindowArranger const , sal_uInt32
i_nX, sal_uInt32 i_nY, sal_Int32 i_nExpandPrio = 0 );
-// convenience: use for addChild( new WindowArranger( ... ) )
constructs
-size_t addChild( WindowArranger* i_pNewChild, sal_uInt32 i_nX,
sal_uInt32 i_nY, sal_Int32 i_nExpandPrio = 0 )
-{ return addChild( boost
[Libreoffice-commits] .: 3 commits - vcl/inc vcl/unx
vcl/inc/win/salids.hrc |2 -
vcl/unx/generic/app/saldisp.cxx | 62 ++--
2 files changed, 10 insertions(+), 54 deletions(-)
New commits:
commit ae501cc73fe11c0f7b85b9f8be2bfb0d6fbe487f
Author: Thomas Arnhold tho...@arnhold.org
Date: Mon Jan 30 22:48:36 2012 +0100
W40ONLY is never defined
diff --git a/vcl/inc/win/salids.hrc b/vcl/inc/win/salids.hrc
index 3049f11..f8aec19 100644
--- a/vcl/inc/win/salids.hrc
+++ b/vcl/inc/win/salids.hrc
@@ -30,9 +30,7 @@
// Cursor
#define SAL_RESID_POINTER_NULL 1
-#ifndef W40ONLY
#define SAL_RESID_POINTER_HELP 10001
-#endif
#ifndef WNT
#define SAL_RESID_POINTER_HSIZE 10002
#define SAL_RESID_POINTER_VSIZE 10003
commit 3b90a3f1eaf9b98e52917d97b6991762d498c10d
Author: Thomas Arnhold tho...@arnhold.org
Date: Sun Jan 29 15:24:33 2012 +0100
vcl: stuff
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 90cfe61..4c10665 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -243,14 +243,18 @@ sal_Bool SalDisplay::BestVisual( Display *pDisplay,
VisualID nDefVID = XVisualIDFromVisual( DefaultVisual( pDisplay, nScreen )
);
XVisualInfo aVI;
+//aVI.visualid = nDefVID;
aVI.screen = nScreen;
// get all visuals
int nVisuals;
XVisualInfo* pVInfos = XGetVisualInfo( pDisplay, VisualScreenMask,
aVI, nVisuals );
+if (!pVInfos)
+return sal_False;
+
// HACK
-rVI = pVInfos[ 0 ];
+rVI = *pVInfos;
XFree( pVInfos );
return rVI.visualid == nDefVID;
@@ -434,10 +438,11 @@ SalDisplay::initScreen( SalX11Screen nXScreen ) const
if( SalDisplay::BestVisual( pDisp_, nXScreen.getXScreen(), aVI ) ) //
DefaultVisual
aColMap = DefaultColormap( pDisp_, nXScreen.getXScreen() );
else
-aColMap = XCreateColormap( pDisp_,
- RootWindow( pDisp_, nXScreen.getXScreen() ),
- aVI.visual,
- AllocNone );
+fprintf( stderr, HACK: XCreateColormap would be called...\n );
+//aColMap = XCreateColormap( pDisp_,
+// RootWindow( pDisp_, nXScreen.getXScreen()
),
+// aVI.visual,
+// AllocNone );
Screen* pScreen = ScreenOfDisplay( pDisp_, nXScreen.getXScreen() );
commit 9c1a107696d032ec4e5e5ac0526c643d3a666c06
Author: Thomas Arnhold tho...@arnhold.org
Date: Sun Jan 29 13:50:45 2012 +0100
vcl: BestVisuals strip
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 5269065..90cfe61 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -241,13 +241,6 @@ sal_Bool SalDisplay::BestVisual( Display *pDisplay,
XVisualInfo rVI )
{
VisualID nDefVID = XVisualIDFromVisual( DefaultVisual( pDisplay, nScreen )
);
-VisualIDnVID = 0;
-char *pVID = getenv( SAL_VISUAL );
-if( pVID )
-sscanf( pVID, %li, nVID );
-
-if( nVID sal_GetVisualInfo( pDisplay, nVID, rVI ) )
-return rVI.visualid == nDefVID;
XVisualInfo aVI;
aVI.screen = nScreen;
@@ -255,49 +248,9 @@ sal_Bool SalDisplay::BestVisual( Display *pDisplay,
int nVisuals;
XVisualInfo* pVInfos = XGetVisualInfo( pDisplay, VisualScreenMask,
aVI, nVisuals );
-// pVInfos should contain at least one visual, otherwise
-// we're in trouble
-int* pWeight = (int*)alloca( sizeof(int)*nVisuals );
-int i;
-for( i = 0; i nVisuals; i++ )
-{
-sal_Bool bUsable = sal_False;
-int nTrueColor = 1;
-
-if ( pVInfos[i].screen != nScreen )
-{
-bUsable = sal_False;
-}
-else
-if( pVInfos[i].c_class == TrueColor )
-{
-nTrueColor = 2048;
-if( pVInfos[i].depth == 24 )
-bUsable = sal_True;
-}
-else if( pVInfos[i].c_class == PseudoColor )
-{
-if( pVInfos[i].depth = 8 )
-bUsable = sal_True;
-else if( pVInfos[i].depth == 12 )
-bUsable = sal_True;
-}
-pWeight[ i ] = bUsable ? nTrueColor*pVInfos[i].depth : -1024;
-pWeight[ i ] -= pVInfos[ i ].visualid;
-}
-
-int nBestVisual = 0;
-int nBestWeight = -1024;
-for( i = 0; i nVisuals; i++ )
-{
-if( pWeight[ i ] nBestWeight )
-{
-nBestWeight = pWeight[ i ];
-nBestVisual = i;
-}
-}
-rVI = pVInfos[ nBestVisual ];
+// HACK
+rVI = pVInfos[ 0 ];
XFree( pVInfos );
return rVI.visualid == nDefVID
[Libreoffice-commits] .: 2 commits - vcl/unx
vcl/unx/generic/app/saldisp.cxx | 62 +---
1 file changed, 52 insertions(+), 10 deletions(-)
New commits:
commit 0e93d1e91f2b6994e509e16de6989afb8fdf3207
Author: Thomas Arnhold tho...@arnhold.org
Date: Mon Jan 30 22:52:19 2012 +0100
Revert vcl: BestVisuals strip
This reverts commit 9c1a107696d032ec4e5e5ac0526c643d3a666c06.
this is work is progress, not public...
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 90cfe61..5269065 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -241,6 +241,13 @@ sal_Bool SalDisplay::BestVisual( Display *pDisplay,
XVisualInfo rVI )
{
VisualID nDefVID = XVisualIDFromVisual( DefaultVisual( pDisplay, nScreen )
);
+VisualIDnVID = 0;
+char *pVID = getenv( SAL_VISUAL );
+if( pVID )
+sscanf( pVID, %li, nVID );
+
+if( nVID sal_GetVisualInfo( pDisplay, nVID, rVI ) )
+return rVI.visualid == nDefVID;
XVisualInfo aVI;
aVI.screen = nScreen;
@@ -248,9 +255,49 @@ sal_Bool SalDisplay::BestVisual( Display *pDisplay,
int nVisuals;
XVisualInfo* pVInfos = XGetVisualInfo( pDisplay, VisualScreenMask,
aVI, nVisuals );
+// pVInfos should contain at least one visual, otherwise
+// we're in trouble
+int* pWeight = (int*)alloca( sizeof(int)*nVisuals );
+int i;
+for( i = 0; i nVisuals; i++ )
+{
+sal_Bool bUsable = sal_False;
+int nTrueColor = 1;
+
+if ( pVInfos[i].screen != nScreen )
+{
+bUsable = sal_False;
+}
+else
+if( pVInfos[i].c_class == TrueColor )
+{
+nTrueColor = 2048;
+if( pVInfos[i].depth == 24 )
+bUsable = sal_True;
+}
+else if( pVInfos[i].c_class == PseudoColor )
+{
+if( pVInfos[i].depth = 8 )
+bUsable = sal_True;
+else if( pVInfos[i].depth == 12 )
+bUsable = sal_True;
+}
+pWeight[ i ] = bUsable ? nTrueColor*pVInfos[i].depth : -1024;
+pWeight[ i ] -= pVInfos[ i ].visualid;
+}
+
+int nBestVisual = 0;
+int nBestWeight = -1024;
+for( i = 0; i nVisuals; i++ )
+{
+if( pWeight[ i ] nBestWeight )
+{
+nBestWeight = pWeight[ i ];
+nBestVisual = i;
+}
+}
-// HACK
-rVI = pVInfos[ 0 ];
+rVI = pVInfos[ nBestVisual ];
XFree( pVInfos );
return rVI.visualid == nDefVID;
commit e11cfa9225b05415e12cf3b3cecc05103e62398a
Author: Thomas Arnhold tho...@arnhold.org
Date: Mon Jan 30 22:52:10 2012 +0100
Revert vcl: stuff
This reverts commit 3b90a3f1eaf9b98e52917d97b6991762d498c10d.
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 4c10665..90cfe61 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -243,18 +243,14 @@ sal_Bool SalDisplay::BestVisual( Display *pDisplay,
VisualID nDefVID = XVisualIDFromVisual( DefaultVisual( pDisplay, nScreen )
);
XVisualInfo aVI;
-//aVI.visualid = nDefVID;
aVI.screen = nScreen;
// get all visuals
int nVisuals;
XVisualInfo* pVInfos = XGetVisualInfo( pDisplay, VisualScreenMask,
aVI, nVisuals );
-if (!pVInfos)
-return sal_False;
-
// HACK
-rVI = *pVInfos;
+rVI = pVInfos[ 0 ];
XFree( pVInfos );
return rVI.visualid == nDefVID;
@@ -438,11 +434,10 @@ SalDisplay::initScreen( SalX11Screen nXScreen ) const
if( SalDisplay::BestVisual( pDisp_, nXScreen.getXScreen(), aVI ) ) //
DefaultVisual
aColMap = DefaultColormap( pDisp_, nXScreen.getXScreen() );
else
-fprintf( stderr, HACK: XCreateColormap would be called...\n );
-//aColMap = XCreateColormap( pDisp_,
-// RootWindow( pDisp_, nXScreen.getXScreen()
),
-// aVI.visual,
-// AllocNone );
+aColMap = XCreateColormap( pDisp_,
+ RootWindow( pDisp_, nXScreen.getXScreen() ),
+ aVI.visual,
+ AllocNone );
Screen* pScreen = ScreenOfDisplay( pDisp_, nXScreen.getXScreen() );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/inc
vcl/inc/ios/salframe.h |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7205e0c3ee52a2e5259c8f4e53bba85ee6db6bb6 Author: Thomas Arnhold tho...@arnhold.org Date: Sat Jan 28 11:11:17 2012 +0100 ios: fix mis-merge diff --git a/vcl/inc/ios/salframe.h b/vcl/inc/ios/salframe.h index 68c4cbf..b76ddfd 100644 --- a/vcl/inc/ios/salframe.h +++ b/vcl/inc/ios/salframe.h @@ -139,7 +139,7 @@ public: virtual voidSync(); virtual voidSetInputContext( SalInputContext* pContext ); virtual voidEndExtTextInput( sal_uInt16 nFlags ); -virtual String GetKeyName( sal_uInt16 nKeyCode ); +virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode ); virtual sal_BoolMapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode rKeyCode ); virtual LanguageTypeGetInputLanguage(); virtual SalBitmap* SnapShot(); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basegfx/Library_basegfx.mk basegfx/Package_inc.mk basegfx/StaticLibrary_basegfx_s.mk basegfx/test
basegfx/Library_basegfx.mk |1 -
basegfx/Package_inc.mk |1 -
basegfx/StaticLibrary_basegfx_s.mk |1 -
basegfx/test/basegfx2d.cxx | 28
4 files changed, 31 deletions(-)
New commits:
commit 57dacf1328e4cff53c108f627b3be2b3329f0e90
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Jan 28 11:22:52 2012 +0100
remove traces of b2dhompoint
diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index fc6a479..e659f4e 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -113,7 +113,6 @@ $(eval $(call gb_Library_add_exception_objects,basegfx,\
basegfx/source/point/b3ipoint \
basegfx/source/point/b2dpoint \
basegfx/source/point/b3dpoint \
- basegfx/source/point/b2dhompoint \
basegfx/source/point/b2ipoint \
basegfx/source/curve/b2dbeziertools \
basegfx/source/curve/b2dcubicbezier \
diff --git a/basegfx/Package_inc.mk b/basegfx/Package_inc.mk
index 13b5ff8..bf088b3 100644
--- a/basegfx/Package_inc.mk
+++ b/basegfx/Package_inc.mk
@@ -90,7 +90,6 @@ $(eval $(call
gb_Package_add_file,basegfx_inc,inc/basegfx/matrix/b2dhommatrixtoo
$(eval $(call
gb_Package_add_file,basegfx_inc,inc/basegfx/point/b3ipoint.hxx,basegfx/point/b3ipoint.hxx))
$(eval $(call
gb_Package_add_file,basegfx_inc,inc/basegfx/point/b3dpoint.hxx,basegfx/point/b3dpoint.hxx))
$(eval $(call
gb_Package_add_file,basegfx_inc,inc/basegfx/point/b2dpoint.hxx,basegfx/point/b2dpoint.hxx))
-$(eval $(call
gb_Package_add_file,basegfx_inc,inc/basegfx/point/b2dhompoint.hxx,basegfx/point/b2dhompoint.hxx))
$(eval $(call
gb_Package_add_file,basegfx_inc,inc/basegfx/point/b2ipoint.hxx,basegfx/point/b2ipoint.hxx))
$(eval $(call
gb_Package_add_file,basegfx_inc,inc/basegfx/curve/b2dcubicbezier.hxx,basegfx/curve/b2dcubicbezier.hxx))
$(eval $(call
gb_Package_add_file,basegfx_inc,inc/basegfx/curve/b2dbeziertools.hxx,basegfx/curve/b2dbeziertools.hxx))
diff --git a/basegfx/StaticLibrary_basegfx_s.mk
b/basegfx/StaticLibrary_basegfx_s.mk
index 69616f7..e72a328 100644
--- a/basegfx/StaticLibrary_basegfx_s.mk
+++ b/basegfx/StaticLibrary_basegfx_s.mk
@@ -118,7 +118,6 @@ $(eval $(call
gb_StaticLibrary_add_generated_exception_objects,basegfx_s,\
CustomTarget/basegfx/source/point/b3ipoint \
CustomTarget/basegfx/source/point/b2dpoint \
CustomTarget/basegfx/source/point/b3dpoint \
- CustomTarget/basegfx/source/point/b2dhompoint \
CustomTarget/basegfx/source/point/b2ipoint \
CustomTarget/basegfx/source/curve/b2dbeziertools \
CustomTarget/basegfx/source/curve/b2dcubicbezier \
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index 0f0c9c7..d6e26a8 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -703,33 +703,6 @@ public:
}; // class b2dhommatrix
-class b2dhompoint : public CppUnit::TestFixture
-{
-public:
-// initialise your test code values here.
-void setUp()
-{
-}
-
-void tearDown()
-{
-}
-
-// insert your test code here.
-void EmptyMethod()
-{
-}
-
-// Change the following lines only, if you add, remove or rename
-// member functions of the current class,
-// because these macros are need by auto register mechanism.
-
-SAL_CPPUNIT_TEST_SUITE(b2dhompoint);
-CPPUNIT_TEST(EmptyMethod);
-SAL_CPPUNIT_TEST_SUITE_END();
-}; // class b2dhompoint
-
-
class b2dpoint : public CppUnit::TestFixture
{
public:
@@ -1390,7 +1363,6 @@ public:
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dsvgdimpex);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dpolyrange);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dhommatrix);
-CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dhompoint);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dpoint);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dpolygon);
CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dpolygontools);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - vcl/unx
vcl/unx/generic/app/saldata.cxx |7
vcl/unx/generic/app/saldisp.cxx | 59
2 files changed, 66 deletions(-)
New commits:
commit da15496978332189d3eb002b1c49e4b7fb6b2848
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Jan 28 21:39:48 2012 +0100
Remove VisualClassName
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index d253cd6..5269065 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -99,15 +99,6 @@ using ::rtl::OUString;
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
// -=-= static variables -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-static const char* const VisualClassName[] = {
-StaticGray,
-GrayScale,
-StaticColor,
-PseudoColor,
-TrueColor,
-DirectColor
-};
-
static const char* const EventNames[] =
{
NULL,
@@ -2245,10 +2236,6 @@ void SalDisplay::PrintInfo() const
GetVisual(m_nXDefaultScreen).red_mask,
GetVisual(m_nXDefaultScreen).green_mask,
GetVisual(m_nXDefaultScreen).blue_mask );
-fprintf( stderr, \tVisual\t%d-bit %s ID=0x%x\n,
- GetVisual(m_nXDefaultScreen).GetDepth(),
- VisualClassName[ GetVisual(m_nXDefaultScreen).GetClass() ],
- sal::static_int_cast unsigned int
(GetVisual(m_nXDefaultScreen).GetVisualId()) );
}
void SalDisplay::addXineramaScreenUnique( int i, long i_nX, long i_nY, long
i_nWidth, long i_nHeight )
commit c3ac689d50d5fe3c01ddf304506d6b4711062bea
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Jan 28 21:31:34 2012 +0100
simplify PSEUDOCOLOR12
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index b343195..d253cd6 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -92,14 +92,6 @@ using ::rtl::OUString;
// -=-= #defines -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-#define PSEUDOCOLOR12
-#define PSEUDOCOLOR8
-#define TRUECOLOR24
-#define TRUECOLOR16
-#define TRUECOLOR15
-#define TRUECOLOR12
-#define TRUECOLOR8
-
#define SALCOLOR_WHITE MAKE_SALCOLOR( 0xFF, 0xFF, 0xFF )
#define SALCOLOR_BLACK MAKE_SALCOLOR( 0x00, 0x00, 0x00 )
@@ -296,10 +288,8 @@ sal_Bool SalDisplay::BestVisual( Display *pDisplay,
{
if( pVInfos[i].depth = 8 )
bUsable = sal_True;
-#ifdef PSEUDOCOLOR12
else if( pVInfos[i].depth == 12 )
bUsable = sal_True;
-#endif
}
pWeight[ i ] = bUsable ? nTrueColor*pVInfos[i].depth : -1024;
pWeight[ i ] -= pVInfos[ i ].visualid;
@@ -2803,11 +2793,7 @@ SalColor SalColormap::GetColor( Pixel nPixel ) const
if( m_aPalette.empty()
m_hColormap
-#ifdef PSEUDOCOLOR12
m_aVisual.GetDepth() = 12
-#else
- m_aVisual.GetDepth() = 8
-#endif
m_aVisual.GetClass() == PseudoColor )
((SalColormap*)this)-GetPalette();
}
@@ -2867,11 +2853,7 @@ Pixel SalColormap::GetPixel( SalColor nSalColor ) const
{
if( m_aPalette.empty()
m_hColormap
-#ifdef PSEUDOCOLOR12
m_aVisual.GetDepth() = 12
-#else
- m_aVisual.GetDepth() = 8
-#endif
m_aVisual.GetClass() == PseudoColor ) // what else ???
((SalColormap*)this)-GetPalette();
commit 10e3da7bf2125091ab69efa2b8f72dc1232052f0
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Jan 28 21:27:54 2012 +0100
sal_TrueCOLOR is never defined
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 119f08c..b343195 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -291,30 +291,6 @@ sal_Bool SalDisplay::BestVisual( Display *pDisplay,
nTrueColor = 2048;
if( pVInfos[i].depth == 24 )
bUsable = sal_True;
-#ifdef sal_TrueCOLOR8
-else if( pVInfos[i].depth == 8 )
-{
-nTrueColor = -1; // strongly discourage 8 bit true color
-bUsable = sal_True;
-}
-#endif
-#ifdef sal_TrueCOLOR15
-else if( pVInfos[i].depth == 15 )
-bUsable = sal_True;
-#endif
-#ifdef sal_TrueCOLOR16
-else if( pVInfos[i].depth == 16 )
-bUsable = sal_True;
-#endif
-#ifdef sal_TrueCOLOR32
-else if( pVInfos[i].depth == 32 )
-{
-nTrueColor = 256;
-// we do not have use for an alpha channel
-// better use a 24 or 16 bit truecolor visual if possible
-bUsable = sal_True;
-}
-#endif
}
else if( pVInfos[i].c_class == PseudoColor )
{
commit
[Libreoffice-commits] .: vcl/inc vcl/unx
vcl/inc/unx/saldisp.hxx | 11 -
vcl/unx/generic/app/keysymnames.cxx | 364
vcl/unx/generic/app/saldisp.cxx | 17 -
3 files changed, 7 insertions(+), 385 deletions(-)
New commits:
commit 2233aa52da14ec85331aee1163b885fe9a9fb507
Author: Thomas Arnhold tho...@arnhold.org
Date: Thu Jan 26 11:00:31 2012 +0100
keysymnames: get rid of some insanity
getKeysymReplacementName() returned a translated keyname, now
XKeysymToString() is called directly. This change had no negative
effect to me. I tried it with a fixed string as return value for
getKeysymReplacementName() on a german interface. INSRT is still
translated to EINFG as this is done by po files.
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 94b66dc..3e4eb4e 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -470,17 +470,6 @@ public:
voidSetupInput( SalI18N_InputMethod *pInputMethod );
};
-/*--
- keep track of correct size of the initial window
- */
-// get foreign key names
-namespace vcl_sal {
-rtl::OUString getKeysymReplacementName(
-const char* pKeyboard,
-KeySym nSymbol );
-}
-
-
#endif // _SV_SALDISP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/app/keysymnames.cxx
b/vcl/unx/generic/app/keysymnames.cxx
index 4569091..ce6a7e7 100644
--- a/vcl/unx/generic/app/keysymnames.cxx
+++ b/vcl/unx/generic/app/keysymnames.cxx
@@ -64,370 +64,6 @@
#include string.h
-namespace vcl_sal {
-
-struct KeysymNameReplacement
-{
-KeySym aSymbol;
-const char* pName;
-};
-
-struct KeyboardReplacements
-{
-const char* pKeyboardName;
-const KeysymNameReplacement*pReplacements;
-int nReplacements;
-};
-
-//
-//
-// CAUTION CAUTION CAUTION
-// every string value in the replacements tables must be in UTF8
-// be careful with your editor !
-//
-//
-
-static const struct KeysymNameReplacement aImplReplacements_English[] =
-{
-{ XK_Control_L, Ctrl },
-{ XK_Control_R, Ctrl },
-{ XK_Escape, Esc },
-{ XK_space, Space },
-};
-
-static const struct KeysymNameReplacement aImplReplacements_Turkish[] =
-{
-{ XK_Control_L, Ctrl },
-{ XK_Control_R, Ctrl },
-{ XK_Right, SaÄ },
-{ XK_Left, Sol },
-{ XK_Up, Yukarı },
-{ XK_Down, AÅaÄı },
-{ XK_space, BoÅluk }
-};
-
-static const struct KeysymNameReplacement aImplReplacements_Russian[] =
-{
-{ XK_Right, ÐпÑаво },
-{ XK_Left, Ðлево },
-{ XK_Up, ÐвеÑÑ
},
-{ XK_Down, Ðниз },
-{ XK_space, ÐÑобел }
-};
-
-static const struct KeysymNameReplacement aImplReplacements_German[] =
-{
-{ XK_Control_L, Strg },
-{ XK_Control_R, Strg },
-{ XK_Shift_L, Umschalt },
-{ XK_Shift_R, Umschalt },
-{ XK_Alt_L, Alt },
-{ XK_Alt_R, Alt Gr },
-{ XK_Page_Up, Bild auf },
-{ XK_Page_Down, Bild ab },
-{ XK_End, Ende },
-{ XK_Home, Pos 1 },
-{ XK_Insert, Einfg },
-{ XK_Delete, Entf },
-{ XK_Escape, Esc },
-{ XK_Right, Rechts },
-{ XK_Left, Links },
-{ XK_Up, Oben },
-{ XK_Down, Unten },
-{ XK_BackSpace, Rückschritt },
-{ XK_Return, Eingabe },
-{ XK_slash, Schrägstrich },
-{ XK_space, Leertaste },
-{ SunXK_Stop, Stop },
-{ SunXK_Again, Wiederholen },
-{ SunXK_Props, Eigenschaften },
-{ SunXK_Undo, Zurücknehmen },
-{ SunXK_Front, Vordergrund },
-{ SunXK_Copy, Kopieren },
-{ SunXK_Open, Ãffnen },
-{ SunXK_Paste, Einsetzen },
-{ SunXK_Find, Suchen },
-{ SunXK_Cut, Ausschneiden },
-};
-
-static const struct KeysymNameReplacement aImplReplacements_French[] =
-{
-{ XK_Shift_L, Maj },
-{ XK_Shift_R, Maj },
-{ XK_Page_Up, Pg. Préc },
-{ XK_Page_Down, Pg. Suiv },
-{ XK_End, Fin },
-{ XK_Home, Origine },
-{ XK_Insert, Insérer },
-{ XK_Delete, Suppr },
-{ XK_Escape, Esc },
-{ XK_Right, Droite },
-{ XK_Left, Gauche },
-{ XK_Up, Haut },
-{ XK_Down, Bas },
-{ XK_BackSpace, Ret. Arr },
-{ XK_Return, Retour },
-{ XK_KP_Enter, Entrée },
-{ SunXK_Stop, Stop },
-{ SunXK_Again, Encore },
-{ SunXK_Props, Props },
-{ SunXK_Undo, Annuler },
-{ SunXK_Front, Devant },
-{ SunXK_Copy, Copy
[Libreoffice-commits] .: avmedia/source extensions/source sal/qa sd/source vcl/test
avmedia/source/gstreamer/gstplayer.cxx|2 +-
extensions/source/plugin/base/nfuncs.cxx |6 +++---
extensions/source/plugin/base/xplugin.cxx |4 ++--
sal/qa/osl/socket/osl_Socket.cxx |4 ++--
sal/qa/osl/socket/osl_Socket2.cxx |4 ++--
sd/source/filter/eppt/pptx-epptbase.cxx |6 +++---
vcl/test/dndtest.cxx | 10 +-
7 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 04b8bac4a9e8e251ca61c4373beb0f1df76b2d54
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Jan 24 10:19:42 2012 +0100
finalize gcc 4.7 string literal operators
diff --git a/avmedia/source/gstreamer/gstplayer.cxx
b/avmedia/source/gstreamer/gstplayer.cxx
index c394b50..a8d2642 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -380,7 +380,7 @@ void SAL_CALL Player::setMediaTime( double fTime )
if( !isPlaying() )
gst_element_set_state( mpPlaybin, GST_STATE_PAUSED );
-DBG( seek to: %SAL_PRIdINT64 ns original: %lf s, gst_position,
fTime );
+DBG( seek to: % SAL_PRIdINT64 ns original: %lf s, gst_position,
fTime );
}
}
diff --git a/extensions/source/plugin/base/nfuncs.cxx
b/extensions/source/plugin/base/nfuncs.cxx
index 69b73f5..b06665b 100644
--- a/extensions/source/plugin/base/nfuncs.cxx
+++ b/extensions/source/plugin/base/nfuncs.cxx
@@ -56,7 +56,7 @@ void TRACE( char const * s )
if (s_file)
{
oslThreadIdentifier t = osl_getThreadIdentifier(0);
-fprintf( s_file, log [t_id=%SAL_PRIuUINT32]: %s\n, t, s );
+fprintf( s_file, log [t_id=% SAL_PRIuUINT32 ]: %s\n, t, s );
fflush( s_file );
}
}
@@ -67,7 +67,7 @@ void TRACEN( char const * s, long n )
if (s_file)
{
oslThreadIdentifier t = osl_getThreadIdentifier(0);
-fprintf( s_file, log [t_id=%SAL_PRIuUINT32]: %s%ld\n, t, s, n );
+fprintf( s_file, log [t_id=% SAL_PRIuUINT32 ]: %s%ld\n, t, s, n );
fflush( s_file );
}
}
@@ -78,7 +78,7 @@ void TRACES( char const* s, char const* s2 )
if (s_file)
{
oslThreadIdentifier t = osl_getThreadIdentifier(0);
-fprintf( s_file, log [t_id=%SAL_PRIuUINT32]: %s %s\n, t, s, s2 );
+fprintf( s_file, log [t_id=% SAL_PRIuUINT32 ]: %s %s\n, t, s, s2 );
fflush( s_file );
}
}
diff --git a/extensions/source/plugin/base/xplugin.cxx
b/extensions/source/plugin/base/xplugin.cxx
index 0a9618d..263cb4e 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -751,7 +751,7 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString
mimetype,
fprintf( stderr,
new stream \%s\ of MIMEType \%s\\n
for plugin \%s\\n
- seekable = %s, length = %SAL_PRIdINT32\n,
+ seekable = %s, length = % SAL_PRIdINT32 \n,
aURL.getStr(), aMIME.getStr(),
getPluginComm()-getLibName().getStr(),
isfile ? true : false, length );
@@ -862,7 +862,7 @@ void XPlugin_Impl::setPosSize( sal_Int32 nX_, sal_Int32
nY_, sal_Int32 nWidth_,
Guard Mutex aGuard( m_aMutex );
#if OSL_DEBUG_LEVEL 1
-fprintf( stderr, XPlugin_Impl::setPosSize( %SAL_PRIdINT32,
%SAL_PRIdINT32, %SAL_PRIdINT32, %SAL_PRIdINT32, %d )\n,
+fprintf( stderr, XPlugin_Impl::setPosSize( % SAL_PRIdINT32 , %
SAL_PRIdINT32 , % SAL_PRIdINT32 , % SAL_PRIdINT32 , %d )\n,
nX_, nY_, nWidth_, nHeight_, nFlags );
#endif
diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx
index 967c1fc..1c3b212 100644
--- a/sal/qa/osl/socket/osl_Socket.cxx
+++ b/sal/qa/osl/socket/osl_Socket.cxx
@@ -2470,7 +2470,7 @@ namespace osl_Socket
// on Linux, the value of option is 1, on Solaris, it's 16, but
it's not important the exact value,
// just judge it is zero or not!
sal_Bool bOK = ( 0 != *pGetBuffer );
-t_print(#setOption_001: getOption is %SAL_PRIdINT32 \n,
*pGetBuffer);
+t_print(#setOption_001: getOption is % SAL_PRIdINT32 \n,
*pGetBuffer);
// toggle check, set to 0
*pbDontRouteSet = 0;
@@ -2482,7 +2482,7 @@ namespace osl_Socket
sal_Bool bOK2 = ( 0 == *pGetBuffer );
-t_print(#setOption_001: getOption is %SAL_PRIdINT32 \n,
*pGetBuffer);
+t_print(#setOption_001: getOption is % SAL_PRIdINT32 \n,
*pGetBuffer);
// LLA: sal_Bool * pbDontTouteSet = ( sal_Bool * )malloc( sizeof (
sal_Bool ) );
// LLA: *pbDontTouteSet = sal_True;
diff --git a/sal/qa/osl/socket/osl_Socket2.cxx
b/sal/qa/osl/socket/osl_Socket2.cxx
index 10e1c4b..ba2c1d6 100644
--- a/sal/qa/osl/socket/osl_Socket2.cxx
+++ b/sal/qa/osl/socket/osl_Socket2.cxx
@@ -1107,7 +1107,7 @@ namespace osl_Socket
// on Linux, the value of option is 1, on Solaris, it's 16, but
it's not important the exact value
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/evoab2/NConnection.cxx |4 -
connectivity/source/drivers/evoab2/NDebug.cxx | 40 --
connectivity/source/drivers/evoab2/NDebug.hxx | 45 -
connectivity/source/drivers/evoab2/NStatement.cxx | 13 ++
connectivity/source/drivers/evoab2/makefile.mk |1
5 files changed, 8 insertions(+), 95 deletions(-)
New commits:
commit e8d4222a1cf5770433d465441b35eced9b30f9b8
Author: Thomas Arnhold tho...@arnhold.org
Date: Sun Jan 22 14:20:52 2012 +0100
Remove evoab debug facility and use SAL_INFO
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx
b/connectivity/source/drivers/evoab2/NConnection.cxx
index f3e5313..896d34f 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -36,8 +36,8 @@
#include comphelper/extract.hxx
#include connectivity/dbexception.hxx
#include comphelper/processfactory.hxx
-#include NDebug.hxx
#include comphelper/sequence.hxx
+#include rtl/oustringostreaminserter.hxx
using namespace connectivity::evoab;
using namespace dbtools;
@@ -105,7 +105,7 @@ IMPLEMENT_SERVICE_INFO(OEvoabConnection,
com.sun.star.sdbc.drivers.evoab.Connec
void OEvoabConnection::construct(const ::rtl::OUString url, const Sequence
PropertyValue info) throw(SQLException)
{
osl_incrementInterlockedCount( m_refCount );
-EVO_TRACE_STRING(OEvoabConnection::construct()::url = %s\n, url );
+SAL_INFO(evoab2, OEvoabConnection::construct()::url = url );
::rtl::OUString sPassword;
const char* pPwd= password;
diff --git a/connectivity/source/drivers/evoab2/NDebug.cxx
b/connectivity/source/drivers/evoab2/NDebug.cxx
deleted file mode 100644
index 6fa7af3..000
--- a/connectivity/source/drivers/evoab2/NDebug.cxx
+++ /dev/null
@@ -1,40 +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.
- *
- /
-
-#include NDebug.hxx
-#include osl/diagnose.h
-#if OSL_DEBUG_LEVEL 1
-void evo_traceStringMessage( const sal_Char *pFormat,
- const ::rtl::OUString rString )
-{
-rtl::OString aStr(::rtl::OUStringToOString(rString,
RTL_TEXTENCODING_UTF8));
-OSL_TRACE(pFormat, aStr.getStr());
-}
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/evoab2/NDebug.hxx
b/connectivity/source/drivers/evoab2/NDebug.hxx
deleted file mode 100644
index 95ba056..000
--- a/connectivity/source/drivers/evoab2/NDebug.hxx
+++ /dev/null
@@ -1,45 +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
[Libreoffice-commits] .: qadevOOo/runner
qadevOOo/runner/convwatch/DBHelper.java | 42 --
qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java | 45 --
qadevOOo/runner/convwatch/StringHelper.java | 103
3 files changed, 190 deletions(-)
New commits:
commit 74a356c3464b56e94c2174a0e7a1d63de8f7071e
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Jan 24 15:43:03 2012 +0100
dead java code in qa
diff --git a/qadevOOo/runner/convwatch/DBHelper.java
b/qadevOOo/runner/convwatch/DBHelper.java
index e28fafb..719920b 100644
--- a/qadevOOo/runner/convwatch/DBHelper.java
+++ b/qadevOOo/runner/convwatch/DBHelper.java
@@ -200,54 +200,12 @@ public class DBHelper
return null;
}
-
-/**
- * This method removes all entries of the givenbr
- * module/platform combination
- * @param mdl the name of the module, e.g. sal
- * @param os the name of the platform, e.g. unxsols
- */
-// LLA: public static void SQLdeleteValues(Connection _aCon, String
_sEnvironment, String _sUnitName, String _sMethodName, String _sCWS, String
_sDate)
-// LLA: {
-// LLA: String sSQL =
-// LLA: DELETE FROM states WHERE +
-// LLA: unit= + DatabaseEntry.Quote(_sUnitName) +
-// LLA: AND pf= + DatabaseEntry.Quote (_sEnvironment) +
-// LLA: AND meth= + DatabaseEntry.Quote (_sMethodName) +
-// LLA: AND cws= + DatabaseEntry.Quote(_sCWS) +
-// LLA: AND dt= + DatabaseEntry.Quote(_sDate);
-// LLA:
-// LLA: // ExecSQL(_aCon, sSQL);
-// LLA: }
-
protected synchronized void ExecSQL(Connection _aCon, String _sSQL)
{
MySQLThread aSQLThread = new MySQLThread(_aCon, _sSQL);
aSQLThread.start();
}
-
-
-// public static int QueryIntFromSQL(String _sSQL, String _sColumnName,
String _sValue)
-// {
-// boolean bNeedSecondTry = false;
-// int nValue = 0;
-// do
-// {
-// try
-// {
-// nValue = QueryIntFromSQL(_sSQL, _sColumnName, _sValue);
-// }
-// catch (ValueNotFoundException e)
-// {
-// bNeedSecondTry = true;
-// String sSQL = INSERT INTO + _sTable + ( +
_sColumnName + ) VALUES ( + _sValue + );
-// ExecSQL(sSQL);
-// }
-// } while (bNeedSecondTry);
-// return nValue;
-// }
-
public int QueryIntFromSQL(Connection _aCon, String _sSQL, String
_sColumnName)
throws ValueNotFoundException
{
diff --git a/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java
b/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java
index efce96c..7dde9cb 100644
--- a/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java
+++ b/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java
@@ -68,23 +68,9 @@ public class GraphicalDifferenceCheck
*/
public static void createReferences(String _sInputPath, String
_sReferencePath, GraphicalTestArguments _aGTA) throws ConvWatchException
{
-//!
-//System.out.println(createReferences() InputPath: +
_sInputPath + refpath: + _sReferencePath);
showVersion();
File aInputPath = new File(_sInputPath);
-//System.out.println(Inputpath in file: +
aInputPath.getAbsolutePath());
-//!
-// if (aInputPath.exists())
-// {
-// System.out.println(Inputpath exists);
-// }
-// else
-// {
-// System.out.println(Inputpath doesn't exists);
-// return;
-// }
-
if (aInputPath.isDirectory())
{
String fs = System.getProperty(file.separator);
@@ -102,7 +88,6 @@ public class GraphicalDifferenceCheck
}
else
{
-//!
// System.out.println(No directory.);
createOneReferenceFile(_sInputPath, _sReferencePath, _aGTA);
}
@@ -288,36 +273,6 @@ public class GraphicalDifferenceCheck
return convwatch.ConvWatch.check(_aGTA, _sOutputPath, sInputFile,
_sReferencePath);
}
-
-// LLA: old! /**
-// LLA: old! * Returns 'true' if a reference document on the specific
output path exists.
-// LLA: old! * The name of the document is corresponding to the input
document, which can be
-// LLA: old! * provided by a single name or path.
-// LLA: old! *
-// LLA: old! * @param inputPath the original document name
(possibly including path)
-// LLA: old! * @param referencePath the directory where the reference
document will be stored
-// LLA: old!
-// LLA: old! */
-// LLA: old! public static boolean isReferencExistent(String
[Libreoffice-commits] .: vcl/unx
vcl/unx/kde4/KDEXLib.cxx |4 1 file changed, 4 deletions(-) New commits: commit 5cde352b9622c0e009b52e4848c84584d03e0d5d Author: Thomas Arnhold tho...@arnhold.org Date: Mon Jan 23 15:35:55 2012 +0100 remove duplicate header diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index 56150cf..23822b1 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -51,10 +51,6 @@ #include KDESalDisplay.hxx -#if OSL_DEBUG_LEVEL 1 -#include stdio.h -#endif - #include stdio.h #if QT_VERSION = QT_VERSION_CHECK( 4, 9, 0 ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 6 commits - animations/source basegfx/inc basegfx/source chart2/source connectivity/source cui/source drawinglayer/source oox/inc oox/source padmin/source sc/source svtools/bm
animations/source/animcore/animcore.cxx |2 -
basegfx/inc/basegfx/curve/b2dbeziertools.hxx|2 -
basegfx/source/polygon/b2dpolygoncutandtouch.cxx| 10 ++---
basegfx/source/polygon/b2dpolygontriangulator.cxx |2 -
basegfx/source/polygon/b2dtrapezoid.cxx |2 -
basegfx/source/raster/rasterconvert3d.cxx |4 +-
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx |2 -
chart2/source/model/template/PieChartTypeTemplate.cxx |2 -
connectivity/source/drivers/mozab/MPreparedStatement.cxx|2 -
cui/source/dialogs/SpellDialog.cxx |4 +-
cui/source/dialogs/cuigaldlg.cxx|4 +-
drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx |6 +--
drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx |2 -
drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx |2 -
drawinglayer/source/primitive3d/sdrprimitive3d.cxx |2 -
drawinglayer/source/processor2d/canvasprocessor.cxx |2 -
drawinglayer/source/processor2d/vclhelpergradient.cxx |6 +--
drawinglayer/source/processor2d/vclprocessor2d.cxx |2 -
oox/inc/oox/export/chartexport.hxx |7 ---
oox/inc/oox/export/shapes.hxx |3 -
oox/source/export/chartexport.cxx | 16
oox/source/export/shapes.cxx| 11 --
padmin/source/newppdlg.cxx |2 -
sc/source/filter/xml/xmlexprt.cxx |8 ++--
svtools/bmpmaker/bmpcore.cxx|2 -
svtools/source/filter/wmf/winmtf.cxx|2 -
svx/source/engine3d/helperhittest3d.cxx |2 -
svx/source/table/tablelayouter.cxx | 22
svx/source/table/tablelayouter.hxx |3 -
sw/source/core/docnode/ndtbl.cxx|2 -
sw/source/core/unocore/unoportenum.cxx |4 +-
sw/source/ui/uiview/viewmdi.cxx |2 -
unusedcode.easy | 11 --
vcl/generic/print/printerjob.cxx| 19 --
vcl/inc/generic/printerjob.hxx |4 --
35 files changed, 43 insertions(+), 135 deletions(-)
New commits:
commit 22da27d9ddcdacaef21d667b0777052b7e817b9a
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Jan 21 19:57:19 2012 +0100
Improve checking for emptiness
diff --git a/animations/source/animcore/animcore.cxx
b/animations/source/animcore/animcore.cxx
index 9a837f6..e85b806 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -1178,7 +1178,7 @@ Reference XCloneable SAL_CALL
AnimationNode::createClone() throw (RuntimeExce
{
xNewNode = new AnimationNode( *this );
-if( maChildren.size() )
+if( !maChildren.empty() )
{
Reference XTimeContainer xContainer( xNewNode, UNO_QUERY );
if( xContainer.is() )
diff --git a/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
b/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
index 2279cb9..821cc33 100644
--- a/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
+++ b/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
@@ -54,7 +54,7 @@ namespace basegfx
public:
B2DCubicBezierHelper(const B2DCubicBezier rBase, sal_uInt32
nDivisions = 9);
-double getLength() const { if(maLengthArray.size()) return
maLengthArray[maLengthArray.size() - 1]; else return 0.0; }
+double getLength() const { if(!maLengthArray.empty()) return
maLengthArray[maLengthArray.size() - 1]; else return 0.0; }
double distanceToRelative(double fDistance) const;
};
} // end of namespace basegfx
diff --git a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
index 011ecff..d4d075b 100644
--- a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
+++ b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
@@ -437,7 +437,7 @@ namespace basegfx
// #i76891# using findCuts recursively is not sufficient here
findCutsAndTouchesAndCommonForBezier(aTempPolygonA,
aTempPolygonEdge, aTempPointVectorA, aTempPointVectorEdge);
-if(aTempPointVectorA.size())
+if(!aTempPointVectorA.empty())
{
// adapt tempVector entries to segment
adaptAndTransferCutsWithBezierSegment(aTempPointVectorA,
aTempPolygonA, nIndA, rTempPointsA);
@@ -479,13 +479,13 @@ namespace basegfx
// #i76891# using findCuts recursively is not sufficient here
findCutsAndTouchesAndCommonForBezier(aTempPolygonA, aTempPolygonB
[Libreoffice-commits] .: 2 commits - basegfx/inc basegfx/source formula/inc formula/source sc/source unusedcode.easy vcl/source
basegfx/inc/basegfx/color/bcolortools.hxx | 10 - basegfx/inc/basegfx/tools/canvastools.hxx | 15 -- basegfx/source/color/bcolortools.cxx | 38 -- basegfx/source/tools/canvastools.cxx | 78 formula/inc/formula/formdata.hxx |1 formula/inc/formula/formula.hxx|1 formula/inc/formula/token.hxx |2 formula/inc/formula/tokenarray.hxx |2 formula/source/core/api/token.cxx | 29 formula/source/core/inc/core_resource.hxx |7 - formula/source/core/resource/core_resource.cxx |7 - formula/source/ui/dlg/formula.cxx | 151 - formula/source/ui/dlg/funcutl.cxx | 21 --- formula/source/ui/dlg/structpg.cxx | 10 - formula/source/ui/dlg/structpg.hxx |3 sc/source/ui/inc/formula.hxx |2 unusedcode.easy| 31 - vcl/source/gdi/pdfwriter_impl.cxx | 77 vcl/source/gdi/pdfwriter_impl.hxx |1 19 files changed, 486 deletions(-) New commits: commit d93536e52943c910936504e531956f04d9c0503f Author: Thomas Arnhold tho...@arnhold.org Date: Thu Jan 19 19:14:49 2012 +0100 remove unused methods diff --git a/basegfx/inc/basegfx/color/bcolortools.hxx b/basegfx/inc/basegfx/color/bcolortools.hxx index 5841f04..0bb0659 100644 --- a/basegfx/inc/basegfx/color/bcolortools.hxx +++ b/basegfx/inc/basegfx/color/bcolortools.hxx @@ -50,16 +50,6 @@ namespace basegfx /// Transform from HSV to RGB BASEGFX_DLLPUBLIC BColor hsv2rgb(const BColor rHSVColor); -/// Transform from R'G'B' to YIQ (NTSC color model - Y is used in monochrome mode) -BASEGFX_DLLPUBLIC BColor rgb2yiq(const BColor rRGBColor); -/// Transform from YIQ to R'G'B' (NTSC color model - Y is used in monochrome mode) -BASEGFX_DLLPUBLIC BColor yiq2rgb(const BColor rYIQColor); - -/// Transform from R'G'B' to Y'PbPr (the [0,1]x[-.5,.5]x[-.5,.5] equivalent of Y'CbCr (which is scaled into 8bit)) -BASEGFX_DLLPUBLIC BColor rgb2ypbpr(const BColor rRGBColor); -/// Transform from Y'PbPr (the [0,1]x[-.5,.5]x[-.5,.5] equivalent of Y'CbCr (which is scaled into 8bit)) into R'G'B' -BASEGFX_DLLPUBLIC BColor ypbpr2rgb(const BColor rYPbPrColor); - /// Transform from CIE XYZ into Rec. 709 RGB (D65 white point) BASEGFX_DLLPUBLIC BColor ciexyz2rgb( const BColor rXYZColor ); /// Transform from Rec. 709 RGB (D65 white point) into CIE XYZ diff --git a/basegfx/inc/basegfx/tools/canvastools.hxx b/basegfx/inc/basegfx/tools/canvastools.hxx index 5884563..ea1924a 100644 --- a/basegfx/inc/basegfx/tools/canvastools.hxx +++ b/basegfx/inc/basegfx/tools/canvastools.hxx @@ -138,7 +138,6 @@ namespace basegfx homMatrixFromAffineMatrix( ::basegfx::B2DHomMatrix transform, const ::com::sun::star::geometry::AffineMatrix2Dmatrix ); -BASEGFX_DLLPUBLIC ::basegfx::B2DHomMatrix homMatrixFromAffineMatrix( const ::com::sun::star::geometry::AffineMatrix2D matrix ); BASEGFX_DLLPUBLIC ::basegfx::B3DHomMatrix homMatrixFromAffineMatrix3D( const ::com::sun::star::geometry::AffineMatrix3D matrix ); BASEGFX_DLLPUBLIC ::com::sun::star::geometry::Matrix2D @@ -157,17 +156,13 @@ namespace basegfx BASEGFX_DLLPUBLIC ::com::sun::star::geometry::RealRectangle2D rectangle2DFromB2DRectangle( const ::basegfx::B2DRange ); BASEGFX_DLLPUBLIC ::com::sun::star::geometry::RealRectangle3D rectangle3DFromB3DRectangle( const ::basegfx::B3DRange ); -BASEGFX_DLLPUBLIC ::basegfx::B2DVector b2DSizeFromRealSize2D( const ::com::sun::star::geometry::RealSize2D ); BASEGFX_DLLPUBLIC ::basegfx::B2DPoint b2DPointFromRealPoint2D( const ::com::sun::star::geometry::RealPoint2D ); BASEGFX_DLLPUBLIC ::basegfx::B2DRange b2DRectangleFromRealRectangle2D( const ::com::sun::star::geometry::RealRectangle2D ); BASEGFX_DLLPUBLIC ::basegfx::B3DRange b3DRectangleFromRealRectangle3D( const ::com::sun::star::geometry::RealRectangle3D ); BASEGFX_DLLPUBLIC ::com::sun::star::geometry::IntegerSize2D integerSize2DFromB2ISize( const ::basegfx::B2IVector ); -BASEGFX_DLLPUBLIC ::com::sun::star::geometry::IntegerPoint2D integerPoint2DFromB2IPoint( const ::basegfx::B2IPoint ); -BASEGFX_DLLPUBLIC ::com::sun::star::geometry::IntegerRectangle2D integerRectangle2DFromB2IRectangle( const ::basegfx::B2IRange ); BASEGFX_DLLPUBLIC ::basegfx::B2IVector b2ISizeFromIntegerSize2D( const ::com::sun::star::geometry::IntegerSize2D ); -BASEGFX_DLLPUBLIC ::basegfx::B2IPoint b2IPointFromIntegerPoint2D( const ::com::sun::star::geometry::IntegerPoint2D
[Libreoffice-commits] .: 2 commits - svl/inc svl/source svx/inc svx/source sw/inc sw/source toolkit/inc toolkit/source unusedcode.easy vcl/inc vcl/source
svl/inc/svl/srchitem.hxx|3
svl/source/items/srchitem.cxx | 64 --
svx/inc/svx/ctredlin.hxx|6 -
svx/inc/svx/simptabl.hxx|3
svx/inc/svx/unoshape.hxx|3
svx/source/dialog/_contdlg.cxx | 44
svx/source/dialog/contimp.hxx |3
svx/source/dialog/ctredlin.cxx | 95
svx/source/dialog/simptabl.cxx | 10 --
svx/source/unodraw/unoshape.cxx | 16
sw/inc/pam.hxx |4 -
sw/source/core/crsr/pam.cxx | 10 --
sw/source/core/text/inftxt.cxx | 18 -
sw/source/core/text/inftxt.hxx | 18 -
sw/source/core/text/porlay.hxx |7 --
sw/source/core/text/txtftn.cxx | 10 --
sw/source/core/text/txtio.cxx | 47 -
sw/source/ui/vba/vbacolumn.cxx | 55
sw/source/ui/vba/vbacolumn.hxx |4 -
sw/source/ui/vba/vbastyle.cxx | 27 ---
sw/source/ui/vba/vbastyle.hxx |1
toolkit/inc/toolkit/helper/vclunohelper.hxx |1
toolkit/source/helper/vclunohelper.cxx | 70
unusedcode.easy | 34 --
vcl/inc/vcl/window.hxx |3
vcl/source/window/window.cxx|7 --
26 files changed, 1 insertion(+), 562 deletions(-)
New commits:
commit 105546f7f11ccee50f8066bfb7c753fabb177fc8
Author: Thomas Arnhold tho...@arnhold.org
Date: Wed Jan 18 19:48:19 2012 +0100
remove unused code
diff --git a/svl/inc/svl/srchitem.hxx b/svl/inc/svl/srchitem.hxx
index 7a0be71..c832bac 100644
--- a/svl/inc/svl/srchitem.hxx
+++ b/svl/inc/svl/srchitem.hxx
@@ -171,9 +171,6 @@ public:
inline sal_uInt16 GetLEVLonger() const;
inline voidSetLEVLonger(sal_uInt16 nSet);
-voidGetFromDescriptor( const
::com::sun::star::uno::Reference ::com::sun::star::util::XSearchDescriptor
rDescr );
-voidSetToDescriptor( ::com::sun::star::uno::Reference
::com::sun::star::util::XSearchDescriptor rDescr );
-
inline const com::sun::star::util::SearchOptions
GetSearchOptions() const;
inline void SetSearchOptions( const com::sun::star::util::SearchOptions
rOpt );
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 0e01172..57f1f1d 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -280,70 +280,6 @@ SfxItemPresentation SvxSearchItem::GetPresentation
return SFX_ITEM_PRESENTATION_NONE;
}
-void SvxSearchItem::GetFromDescriptor( const ::com::sun::star::uno::Reference
::com::sun::star::util::XSearchDescriptor rDescr )
-{
-SetSearchString( rDescr-getSearchString() );
-::com::sun::star::uno::Any aAny = rDescr-getPropertyValue(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(SearchWords) ) );
-sal_Bool bTemp = false;
-aAny = bTemp ;
-SetWordOnly( bTemp );
-aAny = rDescr-getPropertyValue( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(SearchCaseSensitive) ) );
-aAny = bTemp ;
-SetExact( bTemp );
-aAny = rDescr-getPropertyValue( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(SearchBackwards) ) );
-aAny = bTemp ;
-SetBackward( bTemp );
-aAny = rDescr-getPropertyValue( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(SearchInSelection) ) );
-aAny = bTemp ;
-SetSelection( bTemp );
-aAny = rDescr-getPropertyValue( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(SearchRegularExpression) ) );
-aAny = bTemp ;
-SetRegExp( bTemp );
-aAny = rDescr-getPropertyValue( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(SearchSimilarity) ) );
-aAny = bTemp ;
-SetLevenshtein( bTemp );
-aAny = rDescr-getPropertyValue( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(SearchSimilarityRelax) ) );
-aAny = bTemp ;
-SetLEVRelaxed( bTemp );
-aAny = rDescr-getPropertyValue( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(SearchSimilarityExchange) ) );
-sal_Int16 nTemp = 0;
-aAny = nTemp ;
-SetLEVOther( nTemp );
-aAny = rDescr-getPropertyValue( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(SearchSimilarityRemove) ) );
-aAny = nTemp ;
-SetLEVShorter( nTemp );
-aAny = rDescr-getPropertyValue( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(SearchSimilarityAdd) ) );
-aAny = nTemp ;
-SetLEVLonger( nTemp );
-}
-
-void SvxSearchItem::SetToDescriptor( ::com::sun::star::uno::Reference
::com::sun::star::util::XSearchDescriptor rDescr )
-{
-rDescr-setSearchString( GetSearchString() );
-::com::sun::star::uno::Any aAny;
-aAny = GetWordOnly() ;
-rDescr-setPropertyValue( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(SearchWords) ), aAny );
-aAny
[Libreoffice-commits] .: sc/inc sc/source unusedcode.easy
sc/inc/dpglobal.hxx |6 ---
sc/inc/dpobject.hxx |4 --
sc/inc/dpsave.hxx|1
sc/inc/dptablecache.hxx |5 ---
sc/source/core/data/dpobject.cxx | 39 ---
sc/source/core/data/dpsave.cxx | 57 --
sc/source/core/data/dptablecache.cxx | 58 ---
sc/source/ui/dbgui/fieldwnd.cxx | 11 --
sc/source/ui/inc/fieldwnd.hxx|6 ---
unusedcode.easy | 14
10 files changed, 201 deletions(-)
New commits:
commit a47cb498471f38987c248519435bc4867ffa456e
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Jan 17 12:53:28 2012 +0100
remove unused ScDP* methods
diff --git a/sc/inc/dpglobal.hxx b/sc/inc/dpglobal.hxx
index 9d99b69..55a6aea 100644
--- a/sc/inc/dpglobal.hxx
+++ b/sc/inc/dpglobal.hxx
@@ -136,23 +136,17 @@ public:
// case insensitive equality
static sal_Int32Compare( const ScDPItemData rA, const ScDPItemData
rB );
-#if OSL_DEBUG_LEVEL 1
-voiddump() const;
-#endif
-
public:
bool IsHasData() const ;
bool IsHasErr() const ;
bool IsValue() const;
String GetString() const ;
double GetValue() const ;
-sal_uLongGetNumFormat() const ;
bool HasStringData() const ;
bool IsDate() const;
bool HasDatePart() const;
void SetDate( bool b ) ;
-TypedStrData* CreateTypeString( );
sal_uInt8GetType() const;
sal_uInt8 GetFlag() throw() { return mbFlag; }
const sal_uInt8 GetFlag() const throw() { return
const_castScDPItemData*(this)-GetFlag(); }
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 47c1999..a894833 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -278,7 +278,6 @@ public:
private:
void updateCache(const ScRange rRange, std::setScDPObject* rRefs);
-void removeCache(const ScRange rRange);
bool remove(const ScDPCache* p);
};
@@ -298,7 +297,6 @@ public:
size_t size() const;
private:
void updateCache(const rtl::OUString rName, const ScRange rRange,
std::setScDPObject* rRefs);
-void removeCache(const ::rtl::OUString rName);
bool remove(const ScDPCache* p);
};
@@ -331,7 +329,6 @@ public:
public:
DBCaches(ScDocument* pDoc);
const ScDPCache* getCache(sal_Int32 nSdbType, const ::rtl::OUString
rDBName, const ::rtl::OUString rCommand);
-size_t size() const;
private:
com::sun::star::uno::Referencecom::sun::star::sdbc::XRowSet
createRowSet(
@@ -339,7 +336,6 @@ public:
void updateCache(sal_Int32 nSdbType, const ::rtl::OUString rDBName,
const ::rtl::OUString rCommand,
std::setScDPObject* rRefs);
-void removeCache(sal_Int32 nSdbType, const ::rtl::OUString rDBName,
const ::rtl::OUString rCommand);
bool remove(const ScDPCache* p);
};
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index fc16b49..ee2fd6d 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -328,7 +328,6 @@ public:
{ return bDrillDown; }
void WriteToSource( const
com::sun::star::uno::Referencecom::sun::star::sheet::XDimensionsSupplier
xSource );
-void Refresh( const
com::sun::star::uno::Referencecom::sun::star::sheet::XDimensionsSupplier
xSource );
bool IsEmpty() const;
const ScDPDimensionSaveData* GetExistingDimensionData() const
diff --git a/sc/inc/dptablecache.hxx b/sc/inc/dptablecache.hxx
index dcfc066..c4c2ebc 100644
--- a/sc/inc/dptablecache.hxx
+++ b/sc/inc/dptablecache.hxx
@@ -103,19 +103,15 @@ public:
SCROW GetIdByItemData( long nDim, const String sItemData ) const;
SCROW GetIdByItemData( long nDim, const ScDPItemData rData ) const;
-SCROW GetAdditionalItemID ( const String sItemData ) const;
SCROW GetAdditionalItemID( const ScDPItemData rData ) const;
SCCOL GetDimensionIndex( String sName) const;
-const ScDPItemData* GetSortedItemData( SCCOL nDim, SCROW nOrder ) const;
sal_uLong GetNumType ( sal_uLong nFormat ) const;
sal_uLong GetNumberFormat( long nDim ) const;
bool IsDateDimension( long nDim ) const ;
-sal_uLong GetDimNumType( SCCOL nDim) const;
SCROW GetDimMemberCount( SCCOL nDim ) const;
SCROW GetOrder( long nDim, SCROW nIndex ) const;
-SCROW GetSortedItemDataId( SCCOL nDim, SCROW nOrder ) const;
const DataListType GetDimMemberValues( SCCOL nDim ) const;
bool InitFromDoc(ScDocument* pDoc, const ScRange rRange);
bool InitFromDataBase(const ::com::sun::star::uno::Reference
::com::sun::star::sdbc::XRowSet xRowSet, const Date rNullDate);
@@ -123,7 +119,6 @@ public:
SCROW GetRowCount() const;
SCROW GetItemDataId( sal_uInt16 nDim, SCROW nRow, bool bRepeatIfEmpty )
const;
String GetDimensionName( sal_uInt16 nColumn ) const;
-bool IsEmptyMember( SCROW nRow
[Libreoffice-commits] .: sc/inc sc/source sfx2/source tools/inc tools/source unusedcode.easy vcl/generic vcl/inc vcl/source xmlsecurity/source
sc/inc/cell.hxx |1
sc/inc/document.hxx |1
sc/source/core/data/cell2.cxx | 26 ---
sc/source/core/data/document.cxx | 23 ---
sc/source/core/tool/scmatrix.cxx | 11 -
sc/source/ui/inc/namedlg.hxx |1
sc/source/ui/namedlg/namedlg.cxx | 14 --
sc/source/ui/vba/vbachart.cxx | 12 -
sc/source/ui/vba/vbachart.hxx |1
sfx2/source/appl/appuno.cxx | 11 -
tools/inc/tools/datetime.hxx |1
tools/inc/tools/line.hxx |4
tools/source/datetime/datetime.cxx| 17 --
tools/source/generic/line.cxx | 147 --
unusedcode.easy | 15 --
vcl/generic/glyphs/glyphcache.cxx |9 -
vcl/inc/generic/glyphcache.hxx|1
vcl/inc/vcl/image.hxx |2
vcl/inc/vcl/lineinfo.hxx |3
vcl/source/gdi/image.cxx | 35 -
vcl/source/gdi/lineinfo.cxx |7 -
xmlsecurity/source/framework/elementcollector.cxx | 32
xmlsecurity/source/framework/elementcollector.hxx |2
23 files changed, 376 deletions(-)
New commits:
commit 804e86170ff2570fd3826b4ac26d1c927e751ac3
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Jan 17 15:28:11 2012 +0100
remove unused methods
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index fa1b719..52244f6 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -454,7 +454,6 @@ public:
voidUpdateRenameTab(SCTAB nTable, const String rName);
boolTestTabRefAbs(SCTAB nTable);
voidUpdateCompile( bool bForceIfNameInUse = false );
-boolIsRangeNameInUse(sal_uInt16 nIndex) const;
voidFindRangeNamesInUse(std::setsal_uInt16 rIndexes) const;
voidReplaceRangeNamesInUse( const ScRangeData::IndexMap rMap
);
boolIsSubTotal() const { return
bSubTotal; }
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 2d232e7..4a0c186 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -576,7 +576,6 @@ public:
static SC_DLLPUBLIC bool ValidTabName( const rtl::OUString rName );
SC_DLLPUBLIC bool ValidNewTabName( const rtl::OUString rName )
const;
-SC_DLLPUBLIC bool ValidNewTabName( const
std::vectorrtl::OUString rName ) const;
SC_DLLPUBLIC void CreateValidTabName(rtl::OUString rName) const;
SC_DLLPUBLIC void
CreateValidTabNames(std::vectorrtl::OUString aNames, SCTAB nCount) const;
diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx
index 95e9bc7..e06d466 100644
--- a/sc/source/core/data/cell2.cxx
+++ b/sc/source/core/data/cell2.cxx
@@ -1534,32 +1534,6 @@ void ScFormulaCell::UpdateGrow( const ScRange rArea,
SCCOL nGrowX, SCROW nGrowY
StartListeningTo( pDocument ); // Listener wie vorher
}
-bool lcl_IsRangeNameInUse(size_t nIndex, ScTokenArray* pCode, ScRangeName*
pNames)
-{
-for (FormulaToken* p = pCode-First(); p; p = pCode-Next())
-{
-if (p-GetOpCode() == ocName)
-{
-if (p-GetIndex() == static_castsal_uInt16(nIndex))
-return true;
-else
-{
-// RangeData kann Null sein in bestimmten Excel-Dateien
-ScRangeData* pSubName = pNames-findByIndex(p-GetIndex());
-if (pSubName lcl_IsRangeNameInUse(nIndex,
-pSubName-GetCode(), pNames))
-return true;
-}
-}
-}
-return false;
-}
-
-bool ScFormulaCell::IsRangeNameInUse(sal_uInt16 nIndex) const
-{
-return lcl_IsRangeNameInUse( nIndex, pCode, pDocument-GetRangeName() );
-}
-
void lcl_FindRangeNamesInUse(std::setsal_uInt16 rIndexes, ScTokenArray*
pCode, ScRangeName* pNames)
{
for (FormulaToken* p = pCode-First(); p; p = pCode-Next())
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index dbc4cec..e5420cb 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -302,29 +302,6 @@ bool ScDocument::ValidNewTabName( const rtl::OUString
rName ) const
}
-bool ScDocument::ValidNewTabName( const std::vectorrtl::OUString rNames )
const//TODO:FIXME what is if there are duplicates in rNames
-{
-bool bValid = true;
-std::vectorrtl::OUString::const_iterator nameIter = rNames.begin();
-for (;nameIter != rNames.end() bValid; ++nameIter)
-{
-bValid = ValidTabName(*nameIter);
-}
-TableContainer::const_iterator it = maTabs.begin();
-for (; it != maTabs.end() bValid
[Libreoffice-commits] .: 2 commits - vcl/inc vcl/unx
vcl/inc/unx/saldisp.hxx | 12 +++ vcl/unx/generic/app/saldisp.cxx | 127 2 files changed, 139 insertions(+) New commits: commit 6cef39508e8a834f694cbfb750e982c623c9bd49 Author: Thomas Arnhold tho...@arnhold.org Date: Mon Jan 16 12:54:27 2012 +0100 Add SOLARIS checks for SalDisplay::IsLocal() This method is (only) used at SalDisplay::GetKeyboardName() for SOLARIS diff --git a/unusedcode.easy b/unusedcode.easy index c4784db..26f593d 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -194,7 +194,6 @@ SVGExport::GetGlyphPlacement() const SVGExport::IsUseGradient() const SVGExport::popClip() SVGExport::pushClip(basegfx::B2DPolyPolygon const) -SalDisplay::IsLocal() SalGraphics::DrawBitmap(SalTwoRect const*, SalBitmap const, unsigned int, OutputDevice const*) SalGraphics::DrawNativeControlText(unsigned int, unsigned int, Rectangle const, unsigned int, ImplControlValue const, rtl::OUString const, OutputDevice const*) SalGraphics::drawAlphaBitmap(SalTwoRect const, SalBitmap const, SalBitmap const) diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index d8ee2ec..94b66dc 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -305,9 +305,13 @@ protected: srv_vendor_tmeServerVendor; SalWM eWindowManager_; + +#if defined(SOLARIS) sal_BoolbLocal_;// Server==Client? Init // in SalDisplay::IsLocal() sal_BoolmbLocalIsValid; // bLocal_ is valid ? +#endif + // until x bytes XLIB_Cursor aPointerCache_[POINTER_COUNT]; @@ -375,7 +379,9 @@ public: XLIB_Cursor GetPointer( int ePointerStyle ); virtual int CaptureMouse( SalFrame *pCapture ); +#if defined(SOLARIS) sal_BoolIsLocal(); +#endif void Remove( XEvent *pEvent ); virtual ScreenData *initScreen( SalX11Screen nXScreen ) const; diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 23ff906..71bc7db 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -228,6 +228,9 @@ static sal_Bool sal_GetVisualInfo( Display *pDisplay, XID nVID, XVisualInfo rVI // --- +/* this stuff is used in SalDisplay::GetKeyboardName for SOLARIS */ +#if defined(SOLARIS) + // check wether displaystring is in format N.M or N. or just N // with N and M beeing natural numbers static sal_Bool @@ -342,6 +345,8 @@ sal_Bool SalDisplay::IsLocal() return (sal_Bool)bLocal_; } +#endif //SOLARIS + // --- extern C srv_vendor_t sal_GetServerVendor( Display *p_display ) @@ -817,9 +822,11 @@ void SalDisplay::Init() SetServerVendor(); X11SalBitmap::ImplCreateCache(); +#if defined(SOLARIS) bLocal_ = sal_False; /* dont care, initialize later by calling SalDisplay::IsLocal() */ mbLocalIsValid = sal_False; /* bLocal_ is not yet initialized */ +#endif // - - - - - - - - - - Synchronize - - - - - - - - - - - - - if( getenv( SAL_SYNCHRONIZE ) ) commit d799ac1320fb11439566a8a6c8215cfb3db10a00 Author: Thomas Arnhold tho...@arnhold.org Date: Mon Jan 16 12:47:36 2012 +0100 Revert Remove unused SalDisplay::IsLocal This reverts commit e9202ffeccdf6f669184f3f869d2e5b121bea9f3. Conflicts: vcl/inc/unx/saldisp.hxx diff --git a/unusedcode.easy b/unusedcode.easy index 26f593d..c4784db 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -194,6 +194,7 @@ SVGExport::GetGlyphPlacement() const SVGExport::IsUseGradient() const SVGExport::popClip() SVGExport::pushClip(basegfx::B2DPolyPolygon const) +SalDisplay::IsLocal() SalGraphics::DrawBitmap(SalTwoRect const*, SalBitmap const, unsigned int, OutputDevice const*) SalGraphics::DrawNativeControlText(unsigned int, unsigned int, Rectangle const, unsigned int, ImplControlValue const, rtl::OUString const, OutputDevice const*) SalGraphics::drawAlphaBitmap(SalTwoRect const, SalBitmap const, SalBitmap const) diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 23d54bd..d8ee2ec 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -305,6 +305,10 @@ protected: srv_vendor_tmeServerVendor; SalWM eWindowManager_; +sal_BoolbLocal_;// Server==Client? Init +// in SalDisplay::IsLocal() +sal_BoolmbLocalIsValid; // bLocal_ is valid ? +// until x bytes XLIB_Cursor aPointerCache_[POINTER_COUNT]; @@ -371,6 +375,8 @@ public: XLIB_Cursor GetPointer( int ePointerStyle ); virtual int CaptureMouse( SalFrame *pCapture ); +sal_BoolIsLocal(); + void Remove( XEvent *pEvent ); virtual ScreenData
[Libreoffice-commits] .: oox/source sdext/source slideshow/test svx/source sw/source unotools/source unoxml/test vcl/aqua vcl/ios vcl/source vcl/test vcl/win
oox/source/token/propertynames.cxx |2 +-
sdext/source/pdfimport/filterdet.cxx |4 ++--
slideshow/test/demoshow.cxx |2 +-
svx/source/dialog/linkwarn.cxx |2 +-
svx/source/svdraw/svdotext.cxx |2 +-
sw/source/filter/ww1/w1class.cxx |2 +-
sw/source/filter/ww1/w1sprm.cxx |2 +-
sw/source/filter/ww8/ww8par6.cxx |4 ++--
unotools/source/misc/fontdefs.cxx|2 +-
unoxml/test/domtest.cxx | 10 +-
vcl/aqua/source/gdi/salgdi.cxx |2 +-
vcl/ios/source/gdi/salgdi.cxx|2 +-
vcl/source/gdi/sallayout.cxx |2 +-
vcl/source/window/window.cxx |2 +-
vcl/test/canvasbitmaptest.cxx|2 +-
vcl/win/source/gdi/salgdi3.cxx |4 ++--
16 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit 2c3d0ff9f83aab89980529da2aa3837390b84ef7
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Jan 10 16:00:18 2012 +0100
Use SAL_N_ELEMENTS
Some more like Thorstens diff 9c59cd15b150638c845bbc275b9b04460afc23bd
Done with some regex magic (and a check if this var is an array):
s/sizeof\(\s*$var\s*\)\s*\/\s*sizeof\(\s*\*$var\s*/SAL_N_ELEMENTS\($var/gs
diff --git a/oox/source/token/propertynames.cxx
b/oox/source/token/propertynames.cxx
index a7c9b87..d65c8d2 100644
--- a/oox/source/token/propertynames.cxx
+++ b/oox/source/token/propertynames.cxx
@@ -41,7 +41,7 @@ PropertyNameVector::PropertyNameVector()
};
-size_t nArraySize = (sizeof( sppcPropertyNames ) / sizeof(
*sppcPropertyNames )) - 1;
+size_t nArraySize = SAL_N_ELEMENTS(sppcPropertyNames) - 1;
reserve( nArraySize );
for( size_t nIndex = 0; nIndex nArraySize; ++nIndex )
push_back( ::rtl::OUString::createFromAscii( sppcPropertyNames[ nIndex
] ) );
diff --git a/sdext/source/pdfimport/filterdet.cxx
b/sdext/source/pdfimport/filterdet.cxx
index 28fd126..969f378 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -139,8 +139,8 @@ namespace {
xPropSet-getPropertyValue(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( Label ))) = aLabel;
const char pFileName[] = %FILENAME;
aLabel = aLabel.replaceAt(
-
aLabel.indexOfAsciiL(pFileName,sizeof(pFileName)/sizeof(*pFileName)-1),
-sizeof(pFileName)/sizeof(*pFileName)-1,
+aLabel.indexOfAsciiL(pFileName,SAL_N_ELEMENTS(pFileName)-1),
+SAL_N_ELEMENTS(pFileName)-1,
aFilename );
xPropSet-setPropertyValue(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( Label )),
uno::makeAny(aLabel));
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index f52ba55..692251e 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -278,7 +278,7 @@ private:
};
static PropMapT aMap( lcl_propertyMap,
- sizeof(lcl_propertyMap)/sizeof(*lcl_propertyMap),
+ SAL_N_ELEMENTS(lcl_propertyMap),
true );
sal_Int16 aRes;
diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx
index 5beecf0..6bc3a1b 100644
--- a/svx/source/dialog/linkwarn.cxx
+++ b/svx/source/dialog/linkwarn.cxx
@@ -114,7 +114,7 @@ void SvxLinkWarningDialog::InitSize()
m_aLinkGraphicBtn, m_aEmbedGraphicBtn, m_aOptionLine,
m_aWarningOnBox
};
Window** pCurrent = pWins;
-for ( sal_uInt32 i = 0; i sizeof(pWins) / sizeof(*pWins); ++i,
++pCurrent )
+for ( sal_uInt32 i = 0; i SAL_N_ELEMENTS(pWins); ++i, ++pCurrent )
{
Point aNewPos = (*pCurrent)-GetPosPixel();
aNewPos.Y() -= nDelta;
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 620b677..e43b160 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1281,7 +1281,7 @@ void SdrTextObj::ImpAutoFitText( SdrOutliner rOutliner,
const Size rTextSize,
// loop early-exits if we detect an already attained value
sal_uInt16 nMinStretchX=0, nMinStretchY=0;
sal_uInt16 aOldStretchXVals[]={0,0,0,0,0,0,0,0,0,0};
-const size_t
aStretchArySize=sizeof(aOldStretchXVals)/sizeof(*aOldStretchXVals);
+const size_t aStretchArySize=SAL_N_ELEMENTS(aOldStretchXVals);
for(unsigned int i=0; iaStretchArySize; ++i)
{
const Size aCurrTextSize = rOutliner.CalcTextSizeNTP();
diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx
index a7e35cd..c1630ca 100644
--- a/sw/source/filter/ww1/w1class.cxx
+++ b/sw/source/filter/ww1/w1class.cxx
@@ -160,7 +160,7 @@ sal_uInt16 Ww1Style::ReadName( sal_uInt8*p, sal_uInt16
rnCountBytes, sal_uInt1
size_t nSize(stc);
if (!nSize)
pStr = W1 Normal;
-else if (nSize - 222 = sizeof(names) / sizeof(*names))
+else
[Libreoffice-commits] .: 2 commits - vcl/inc vcl/unx
vcl/inc/unx/i18n_cb.hxx |3 --
vcl/inc/unx/i18n_ic.hxx |1
vcl/inc/unx/saldisp.hxx |2 -
vcl/unx/generic/app/i18n_cb.cxx | 39
vcl/unx/generic/app/i18n_ic.cxx | 42 ---
vcl/unx/generic/app/saldisp.cxx | 54
6 files changed, 141 deletions(-)
New commits:
commit 22d05186ed7bf0314b43e1db09eb8706d09c6da1
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Dec 17 19:29:49 2011 +0100
callcatcher: remove unused SalColormap methods
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index ded2d1c..8fd0507 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -163,7 +163,6 @@ public:
SalColormap( const SalDisplay* pSalDisplay,
Colormap hColormap,
intnScreen );
-SalColormap( const BitmapPalette rpPalette );
SalColormap( sal_uInt16 nDepth );
SalColormap();
~SalColormap();
@@ -189,7 +188,6 @@ public:
int b ) const;
Pixel GetPixel( SalColor nColor ) const;
SalColorGetColor( Pixel nPixel ) const;
-voidSetPalette( const BitmapPalette rPalette );
};
// -=-= SalXLib =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 3c53b7b..75882cc 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -2777,30 +2777,6 @@ SalColormap::SalColormap( const SalDisplay *pDisplay,
Colormap hColormap, int nS
}
}
-// PseudoColor
-SalColormap::SalColormap( const BitmapPalette rPalette )
-: m_pDisplay( GetGenericData()-GetSalDisplay() ),
- m_hColormap( None ),
- m_nWhitePixel( SALCOLOR_NONE ),
- m_nBlackPixel( SALCOLOR_NONE ),
- m_nUsed( rPalette.GetEntryCount() ),
- m_nScreen( GetGenericData()-GetSalDisplay()-GetDefaultScreenNumber() )
-{
-m_aPalette = std::vectorSalColor(m_nUsed);
-
-for( unsigned int i = 0; i m_nUsed; i++ )
-{
-const BitmapColor rColor = rPalette[i];
-m_aPalette[i] = MAKE_SALCOLOR( rColor.GetRed(),
- rColor.GetGreen(),
- rColor.GetBlue() );
-if( (m_nBlackPixel == SALCOLOR_NONE) (SALCOLOR_BLACK ==
m_aPalette[i]) )
-m_nBlackPixel = i;
-else if( (m_nWhitePixel == SALCOLOR_NONE) (SALCOLOR_WHITE ==
m_aPalette[i]) )
-m_nWhitePixel = i;
-}
-}
-
// MonoChrome
SalColormap::SalColormap()
: m_pDisplay( GetGenericData()-GetSalDisplay() ),
@@ -2913,36 +2889,6 @@ SalColormap::~SalColormap()
#endif
}
-// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void SalColormap::SetPalette( const BitmapPalette rPalette )
-{
-if( this != GetGenericData()-GetSalDisplay()-GetColormap(m_nScreen) )
-{
-m_nBlackPixel = SALCOLOR_NONE;
-m_nWhitePixel = SALCOLOR_NONE;
-}
-
-if( rPalette.GetEntryCount() m_nUsed )
-{
-m_nBlackPixel = SALCOLOR_NONE;
-m_nWhitePixel = SALCOLOR_NONE;
-m_nUsed = rPalette.GetEntryCount();
-m_aPalette = std::vectorSalColor(m_nUsed);
-}
-
-for( int i = 0; i rPalette.GetEntryCount(); i++ )
-{
-const BitmapColor rColor = rPalette[i];
-m_aPalette[i] = MAKE_SALCOLOR( rColor.GetRed(),
- rColor.GetGreen(),
- rColor.GetBlue() );
-if( (m_nBlackPixel == SALCOLOR_NONE) (SALCOLOR_BLACK ==
m_aPalette[i]) )
-m_nBlackPixel = i;
-else if( (m_nWhitePixel == SALCOLOR_NONE) (SALCOLOR_WHITE ==
m_aPalette[i]) )
-m_nWhitePixel = i;
-}
-}
-
void SalColormap::GetPalette()
{
Pixel i;
commit f072008981f77e8e28a9f088b4c3604b860af5f8
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Dec 17 19:27:21 2011 +0100
callcatcher: clean up vcl i18n
diff --git a/vcl/inc/unx/i18n_cb.hxx b/vcl/inc/unx/i18n_cb.hxx
index 7b16a7d..e00dc5f 100644
--- a/vcl/inc/unx/i18n_cb.hxx
+++ b/vcl/inc/unx/i18n_cb.hxx
@@ -35,9 +35,6 @@
extern C {
#endif
-// for iiimp / ml input
-int CommitStringCallback( XIC ic, XPointer client_data, XPointer call_data);
-
// xim callbacks
void PreeditDoneCallback ( XIC ic, XPointer client_data, XPointer call_data);
int PreeditStartCallback( XIC ic, XPointer client_data, XPointer call_data);
diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx
index 3a9c5ab..5e427f9 100644
--- a/vcl/inc/unx/i18n_ic.hxx
+++ b/vcl/inc/unx/i18n_ic.hxx
@@ -82,7 +82,6 @@ public:
void Map( SalFrame *pFrame );
void Unmap( SalFrame* pFrame );
-void SetPreeditState(Bool aPreeditState);
void SetLanguage(LanguageType aInputLanguage);
SalI18N_InputContext( SalFrame *aFrame );
diff --git
[Libreoffice-commits] .: sd/source unusedcode.easy vcl/inc vcl/source
sd/source/filter/eppt/grouptable.hxx |1 -
sd/source/filter/eppt/pptx-grouptable.cxx |8
unusedcode.easy |4
vcl/inc/salgdi.hxx|5 -
vcl/inc/vcl/graph.h |1 -
vcl/inc/vcl/graph.hxx |7 ---
vcl/source/gdi/graph.cxx | 18 --
vcl/source/gdi/impgraph.cxx | 13 -
vcl/source/gdi/salgdilayout.cxx |8
9 files changed, 65 deletions(-)
New commits:
commit a84651f39d4afe662181f695a1a15c4dfe96e7e6
Author: Thomas Arnhold tho...@arnhold.org
Date: Sun Nov 20 04:06:00 2011 +0100
Remove some unused methods
diff --git a/sd/source/filter/eppt/grouptable.hxx
b/sd/source/filter/eppt/grouptable.hxx
index d9e1166..23b2951 100644
--- a/sd/source/filter/eppt/grouptable.hxx
+++ b/sd/source/filter/eppt/grouptable.hxx
@@ -72,7 +72,6 @@ class GroupTable
::com::sun::star::uno::Reference
::com::sun::star::container::XIndexAccess
GetCurrentGroupAccess() const { return
mpGroupEntry[ mnCurrentGroupEntry - 1 ]-mXIndexAccess; };
sal_uInt32 GetGroupsClosed();
-voidSkipCurrentGroup();
voidResetGroupTable( sal_uInt32 nCount );
voidClearGroupTable();
sal_BoolEnterGroup( ::com::sun::star::uno::Reference
::com::sun::star::container::XIndexAccess rIndex );
diff --git a/sd/source/filter/eppt/pptx-grouptable.cxx
b/sd/source/filter/eppt/pptx-grouptable.cxx
index fed63ac..18f4019 100644
--- a/sd/source/filter/eppt/pptx-grouptable.cxx
+++ b/sd/source/filter/eppt/pptx-grouptable.cxx
@@ -131,12 +131,4 @@ sal_Bool GroupTable::GetNextGroupEntry()
//
-
-void GroupTable::SkipCurrentGroup()
-{
-if ( mnCurrentGroupEntry )
-delete ( mpGroupEntry[ --mnCurrentGroupEntry ] );
-}
-
-//
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index 46e92f4..40bb39a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -145,10 +145,6 @@ GDIMetaFile::Wind(unsigned long)
GDIMetaFile::WindEnd()
GDIMetaFile::WindNext()
GraphCtrl::GraphCtrl(Window*, long)
-Graphic::Draw(OutputDevice*, String const, Font, Bitmap const, Point
const, Size const)
-Graphic::StartAnimation(OutputDevice*, Point const, long, OutputDevice*)
-GraphicReader::IsPreviewModeEnabled() const
-GroupTable::SkipCurrentGroup()
GtkSalFrame::popIgnoreDamage()
GtkSalFrame::pushIgnoreDamage()
HTMLControls::Insert(HTMLControl const*, unsigned short)
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 75559cb..1394c17 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -470,11 +470,6 @@ public:
Rectangle rNativeContentRegion,
const OutputDevice *pOutDev );
-static void AddDevFontSubstitute( OutputDevice* pOutDev,
- const String rFontName,
- const String rReplaceFontName,
- sal_uInt16 nFlags = 0 );
-
bool DrawAlphaBitmap( const SalTwoRect,
const SalBitmap rSourceBitmap,
const SalBitmap rAlphaBitmap,
diff --git a/vcl/inc/vcl/graph.h b/vcl/inc/vcl/graph.h
index 1df2ee7..b926936 100644
--- a/vcl/inc/vcl/graph.h
+++ b/vcl/inc/vcl/graph.h
@@ -73,7 +73,6 @@ public:
// TODO: when incompatible changes are possible again
// the preview size hint should be redone
-sal_BoolIsPreviewModeEnabled() const;
voidDisablePreviewMode();
voidSetPreviewSize( const Size );
SizeGetPreviewSize() const;
diff --git a/vcl/inc/vcl/graph.hxx b/vcl/inc/vcl/graph.hxx
index d34a213..c5d57f4 100644
--- a/vcl/inc/vcl/graph.hxx
+++ b/vcl/inc/vcl/graph.hxx
@@ -155,19 +155,12 @@ public:
voidDraw( OutputDevice* pOutDev,
const Point rDestPt,
const Size rDestSize ) const;
-static void Draw( OutputDevice* pOutDev, const String rText,
- Font rFont, const Bitmap rBitmap,
- const Point rDestPt, const Size rDestSize );
static void DrawEx( OutputDevice* pOutDev, const String rText,
Font rFont, const BitmapEx rBitmap,
const Point rDestPt, const Size rDestSize );
voidStartAnimation( OutputDevice* pOutDev,
const Point rDestPt
