[Libreoffice-commits] core.git: comphelper/source cui/inc cui/source dbaccess/source desktop/source filter/qa hwpfilter/qa include/comphelper include/sfx2 include/unotest lotuswordpro/qa package/qa sc
comphelper/source/misc/mimeconfighelper.cxx| 36 ++--- cui/inc/pch/precompiled_cui.hxx|1 cui/source/customize/macropg.cxx |1 cui/source/dialogs/about.cxx |1 cui/source/options/optsave.cxx |8 +- dbaccess/source/ui/dlg/ConnectionHelper.cxx|2 desktop/source/app/dispatchwatcher.cxx |8 +- filter/qa/cppunit/filters-dxf-test.cxx |4 - filter/qa/cppunit/filters-eps-test.cxx |4 - filter/qa/cppunit/filters-met-test.cxx |4 - filter/qa/cppunit/filters-pcd-test.cxx |4 - filter/qa/cppunit/filters-pcx-test.cxx |4 - filter/qa/cppunit/filters-pict-test.cxx|4 - filter/qa/cppunit/filters-ppm-test.cxx |4 - filter/qa/cppunit/filters-psd-test.cxx |4 - filter/qa/cppunit/filters-ras-test.cxx |4 - filter/qa/cppunit/filters-tga-test.cxx |4 - filter/qa/cppunit/filters-tiff-test.cxx|4 - hwpfilter/qa/cppunit/test_hwpfilter.cxx|4 - include/comphelper/documentconstants.hxx | 57 +++- include/comphelper/mimeconfighelper.hxx|6 +- include/sfx2/docfac.hxx|1 include/sfx2/docfilt.hxx | 15 ++--- include/sfx2/fcontnr.hxx | 33 +-- include/sfx2/filedlghelper.hxx |5 - include/sfx2/sfxdefs.hxx | 29 -- include/unotest/filters-test.hxx |8 +- lotuswordpro/qa/cppunit/test_lotuswordpro.cxx |4 - package/qa/cppunit/test_package.cxx|4 - sc/inc/scdll.hxx |1 sc/qa/unit/filters-test.cxx|4 - sc/qa/unit/helper/qahelper.cxx | 14 ++--- sc/qa/unit/helper/qahelper.hxx | 26 - sc/qa/unit/opencl-test.cxx |4 - sc/qa/unit/subsequent_export-test.cxx |4 - sc/qa/unit/subsequent_filters-test.cxx | 12 ++-- sc/source/ui/docshell/docsh.cxx|2 sd/inc/sddll.hxx |1 sd/qa/unit/filters-test.cxx|6 +- sd/qa/unit/sdmodeltestbase.hxx | 20 +++ sd/source/ui/func/fuinsfil.cxx | 26 - sd/source/ui/view/sdview4.cxx |2 sfx2/source/appl/appopen.cxx |4 - sfx2/source/appl/shutdownicon.cxx |2 sfx2/source/bastyp/fltfnc.cxx | 30 +- sfx2/source/dialog/filedlghelper.cxx | 18 +++--- sfx2/source/doc/docfile.cxx|5 - sfx2/source/doc/docfilt.cxx| 10 +-- sfx2/source/doc/guisaveas.cxx | 58 ++--- sfx2/source/doc/objserv.cxx|2 sfx2/source/doc/objstor.cxx| 26 - sfx2/source/view/frmload.cxx |4 - sfx2/source/view/viewfrm.cxx |2 sot/qa/cppunit/test_sot.cxx|4 - starmath/qa/extras/mmlimport-test.cxx |2 svx/source/unodraw/unoshap2.cxx|2 sw/inc/swdll.hxx |1 sw/qa/core/filters-test.cxx| 30 +- sw/qa/core/uwriter.cxx |2 sw/source/core/doc/docglbl.cxx |2 sw/source/core/unocore/unocrsrhelper.cxx |2 sw/source/ui/dbui/mmdocselectpage.cxx |2 sw/source/ui/dbui/mmoutputpage.cxx |6 +- sw/source/ui/envelp/mailmrge.cxx |4 - sw/source/uibase/dbui/dbmgr.cxx|2 sw/source/uibase/dochdl/gloshdl.cxx|2 sw/source/uibase/uiview/srcview.cxx|2 sw/source/uibase/uiview/view2.cxx |4 - unotest/source/cpp/filters-test.cxx|4 - vcl/qa/cppunit/graphicfilter/filters-test.cxx |4 - writerfilter/qa/cppunittests/rtftok/testrtftok.cxx |4 - writerperfect/qa/unit/WpftImportTestBase.cxx |2 writerperfect/qa/unit/WpftImportTestBase.hxx |2 73 files changed, 302 insertions(+), 331 deletions(-) New commits: commit 48bb2913a7459edb17a5f62c2f6e6fbc4f1051e2 Author: Noel Grandin Date: Wed Mar 18 13:03:28 2015 +0200 convert SFX_FILTER_ constants to enum class Change-Id: I7e53cfc90cefd9da7d6ecd795b09214bd44b1613 diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx index ee9b6e5..806fc64 100644 ---
[Libreoffice-commits] core.git: include/sfx2
include/sfx2/docfilt.hxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 366af3559aa8e5767486f76e4a281f703a77ccea Author: Tor Lillqvist Date: Thu Mar 19 09:34:16 2015 +0200 SFX_FILTER_STARTPRESENTATION is unused now Change-Id: I0b82e6d582ad7fa7e860a6b00d48444c65439671 diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx index dad0da5..976ffd6 100644 --- a/include/sfx2/docfilt.hxx +++ b/include/sfx2/docfilt.hxx @@ -32,8 +32,6 @@ #include #include -#define SFX_FILTER_STARTPRESENTATION 0x2000L - class SfxFilterContainer; class SotStorage; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: comphelper/source
comphelper/source/misc/mimeconfighelper.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 4d2de5816378d119d78e81f60075c88baec8fef2
Author: Noel Grandin
Date: Thu Mar 19 09:55:37 2015 +0200
fix windows build
after my commit 48bb2913a7459edb17a5f62c2f6e6fbc4f1051e2
"convert SFX_FILTER_ constants to enum class"
Change-Id: Ieaf524e076f5ecfe16b312a310cd6f5cb8bd637d
diff --git a/comphelper/source/misc/mimeconfighelper.cxx
b/comphelper/source/misc/mimeconfighelper.cxx
index 806fc64..17269a3 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -671,9 +671,9 @@ OUString
MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName(
#ifdef WNT
-sal_Int32 MimeConfigurationHelper::GetFilterFlags( const OUString& aFilterName
)
+SfxFilterFlags MimeConfigurationHelper::GetFilterFlags( const OUString&
aFilterName )
{
-sal_Int32 nFlags = 0;
+SfxFilterFlags nFlags = SfxFilterFlags::NONE;
try
{
if ( !aFilterName.isEmpty() )
@@ -687,7 +687,7 @@ sal_Int32 MimeConfigurationHelper::GetFilterFlags( const
OUString& aFilterName )
if ( aFilterAny >>= aData )
{
SequenceAsHashMap aFilterHM( aData );
-nFlags = aFilterHM.getUnpackedValueOrDefault( "Flags",
(sal_Int32)0 );
+nFlags =
static_cast(aFilterHM.getUnpackedValueOrDefault( "Flags",
(sal_Int32)0 ));
}
}
} catch( uno::Exception& )
@@ -704,7 +704,7 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
OUString aFilterName = UpdateMediaDescriptorWithFilterName( aMediaDescr,
sal_False );
if ( !aFilterName.isEmpty() )
{
-sal_Int32 nFlags = GetFilterFlags( aFilterName );
+SfxFilterFlags nFlags = GetFilterFlags( aFilterName );
// check the OWN flag
bResult = ( nFlags & SfxFilterFlags::OWN );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxsdrexport.cxx |8 +++-
sw/source/filter/ww8/docxsdrexport.hxx |2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 5b55db59f93d526e7c2e192194aa562c640cce16
Author: Miklos Vajna
Date: Thu Mar 19 09:16:16 2015 +0100
DocxSdrExport::Impl: use std::unique_ptr for m_pFlyFillAttrList
Change-Id: I134f375f3785beb05f320be67990d3b2d572d46f
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index a642b17..0f0bc3a 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -140,7 +140,7 @@ struct DocxSdrExport::Impl
bool m_bParagraphSdtOpen;
bool m_bParagraphHasDrawing; ///Flag for checking drawing in a paragraph.
bool m_bFlyFrameGraphic;
-sax_fastparser::FastAttributeList* m_pFlyFillAttrList;
+std::unique_ptr m_pFlyFillAttrList;
sax_fastparser::FastAttributeList* m_pFlyWrapAttrList;
sax_fastparser::FastAttributeList* m_pBodyPrAttrList;
sax_fastparser::FastAttributeList* m_pDashLineStyleAttr;
@@ -166,7 +166,6 @@ struct DocxSdrExport::Impl
m_bParagraphSdtOpen(false),
m_bParagraphHasDrawing(false),
m_bFlyFrameGraphic(false),
- m_pFlyFillAttrList(0),
m_pFlyWrapAttrList(0),
m_pBodyPrAttrList(0),
m_pDashLineStyleAttr(0),
@@ -263,7 +262,7 @@ void DocxSdrExport::setParagraphHasDrawing(bool
bParagraphHasDrawing)
m_pImpl->m_bParagraphHasDrawing = bParagraphHasDrawing;
}
-sax_fastparser::FastAttributeList*& DocxSdrExport::getFlyFillAttrList()
+std::unique_ptr&
DocxSdrExport::getFlyFillAttrList()
{
return m_pImpl->m_pFlyFillAttrList;
}
@@ -1618,8 +1617,7 @@ void DocxSdrExport::writeVMLTextFrame(sw::Frame*
pParentFrame, bool bTextBoxOnly
m_pImpl->textFrameShadow(rFrmFmt);
if (m_pImpl->m_pFlyFillAttrList)
{
-sax_fastparser::XFastAttributeListRef
xFlyFillAttrList(m_pImpl->m_pFlyFillAttrList);
-m_pImpl->m_pFlyFillAttrList = NULL;
+sax_fastparser::XFastAttributeListRef
xFlyFillAttrList(m_pImpl->m_pFlyFillAttrList.release());
pFS->singleElementNS(XML_v, XML_fill, xFlyFillAttrList);
}
if (m_pImpl->m_pDashLineStyleAttr)
diff --git a/sw/source/filter/ww8/docxsdrexport.hxx
b/sw/source/filter/ww8/docxsdrexport.hxx
index da2d975..a086b2a 100644
--- a/sw/source/filter/ww8/docxsdrexport.hxx
+++ b/sw/source/filter/ww8/docxsdrexport.hxx
@@ -76,7 +76,7 @@ public:
bool IsDMLAndVMLDrawingOpen();
bool IsParagraphHasDrawing();
void setParagraphHasDrawing(bool bParagraphHasDrawing);
-sax_fastparser::FastAttributeList*& getFlyFillAttrList();
+std::unique_ptr& getFlyFillAttrList();
sax_fastparser::FastAttributeList* getFlyWrapAttrList();
void setFlyWrapAttrList(sax_fastparser::FastAttributeList* pAttrList);
/// Attributes of , used during DML export of text frames.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/comphelper
include/comphelper/mimeconfighelper.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit adef956348b9ad0420a482367f34ca1df81ab159 Author: Noel Grandin Date: Thu Mar 19 10:34:15 2015 +0200 fix windows build(2) after my commit 48bb2913a7459edb17a5f62c2f6e6fbc4f1051e2 "convert SFX_FILTER_ constants to enum class" Change-Id: I4e8e04bb5b9f2493281826fb156fee51cf40 diff --git a/include/comphelper/mimeconfighelper.hxx b/include/comphelper/mimeconfighelper.hxx index 9f9d9fd..5ba0eb9 100644 --- a/include/comphelper/mimeconfighelper.hxx +++ b/include/comphelper/mimeconfighelper.hxx @@ -113,7 +113,7 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aObject ); #ifdef WNT -sal_Int32 GetFilterFlags( const OUString& aFilterName ); +SfxFilterFlags GetFilterFlags( const OUString& aFilterName ); sal_Bool AddFilterNameCheckOwnFile( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cli_ure/source include/o3tl include/sal pyuno/source solenv/gcc-wrappers
cli_ure/source/climaker/climaker_app.cxx |8
cli_ure/source/climaker/climaker_emit.cxx |5 -
include/o3tl/typed_flags_set.hxx | 12 +++-
include/sal/log.hxx | 12
pyuno/source/module/pyuno_impl.hxx|2 +-
solenv/gcc-wrappers/wrapper.cxx |2 --
6 files changed, 4 insertions(+), 37 deletions(-)
New commits:
commit a251fe4d48237a4d9c9530dafc7bbdce6028e9cf
Author: Tor Lillqvist
Date: Thu Mar 19 10:57:17 2015 +0200
We require MSVC2013 (_MSC_VER == 1800) now
Change-Id: Ice8504041f22e00f2e5010813d9dff1d2987c8d6
diff --git a/cli_ure/source/climaker/climaker_app.cxx
b/cli_ure/source/climaker/climaker_app.cxx
index b8e3f0f..42381ad 100644
--- a/cli_ure/source/climaker/climaker_app.cxx
+++ b/cli_ure/source/climaker/climaker_app.cxx
@@ -630,20 +630,12 @@ SAL_IMPLEMENT_MAIN()
if (g_verbose)
{
-#if _MSC_VER < 1700
-// Bogus: warning C4564: method 'CheckInvalidPathChars' of class
'System::IO::Path' defines unsupported default parameter 'checkAdditional'
-#pragma warning (push)
-#pragma warning (disable: 4564)
-#endif
::System::Console::Write(
"> saving assembly {0}{1}{2}...",
output_dir,
gcnew ::System::String(
::System::IO::Path::DirectorySeparatorChar, 1 ),
output_file );
-#if _MSC_VER < 1700
-#pragma warning (pop)
-#endif
}
assembly_builder->Save( output_file );
if (g_verbose)
diff --git a/cli_ure/source/climaker/climaker_emit.cxx
b/cli_ure/source/climaker/climaker_emit.cxx
index 6f0de95..8706c3c 100644
--- a/cli_ure/source/climaker/climaker_emit.cxx
+++ b/cli_ure/source/climaker/climaker_emit.cxx
@@ -876,11 +876,6 @@ Assembly ^ TypeEmitter::type_resolve(
MethodAttributes::Virtual |
MethodAttributes::NewSlot |
MethodAttributes::HideBySig);
-//#if defined(_MSC_VER) && (_MSC_VER < 1400)
-// MethodAttributes::Instance);
-//#else
-// Instance);
-//#endif
if (TypeClass_INTERFACE_METHOD == xMember->getTypeClass())
{
diff --git a/include/o3tl/typed_flags_set.hxx b/include/o3tl/typed_flags_set.hxx
index 4b6e4f5..3e96003 100644
--- a/include/o3tl/typed_flags_set.hxx
+++ b/include/o3tl/typed_flags_set.hxx
@@ -58,15 +58,9 @@ struct is_typed_flags {
operator E() { return static_cast(value_); }
-#if !defined _MSC_VER || _MSC_VER > 1700
-explicit
-#endif
-operator typename underlying_type::type() { return value_; }
-
-#if !defined _MSC_VER || _MSC_VER > 1700
-explicit
-#endif
-operator bool() { return value_ != 0; }
+explicit operator typename underlying_type::type() { return value_;
}
+
+explicit operator bool() { return value_ != 0; }
private:
typename underlying_type::type value_;
diff --git a/include/sal/log.hxx b/include/sal/log.hxx
index 563ed57..62cdb77 100644
--- a/include/sal/log.hxx
+++ b/include/sal/log.hxx
@@ -74,27 +74,18 @@ template< typename T > inline StreamIgnore operator <<(
SAL_UNUSED_PARAMETER StreamStart const &, SAL_UNUSED_PARAMETER T const &)
{
std::abort();
-#if defined _MSC_VER && _MSC_VER < 1700
-return StreamIgnore();
-#endif
}
template< typename T > inline StreamIgnore operator <<(
SAL_UNUSED_PARAMETER StreamString const &, SAL_UNUSED_PARAMETER T const &)
{
std::abort();
-#if defined _MSC_VER && _MSC_VER < 1700
-return StreamIgnore();
-#endif
}
template< typename T > inline StreamIgnore operator <<(
SAL_UNUSED_PARAMETER StreamIgnore const &, SAL_UNUSED_PARAMETER T const &)
{
std::abort();
-#if defined _MSC_VER && _MSC_VER < 1700
-return StreamIgnore();
-#endif
}
template< typename T > typename T::Result getResult(T const &);
@@ -103,9 +94,6 @@ inline char const * unwrapStream(StreamString const & s) {
return s.string; }
inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const &) {
std::abort();
-#if defined _MSC_VER && _MSC_VER < 1700
-return 0;
-#endif
}
} }
diff --git a/pyuno/source/module/pyuno_impl.hxx
b/pyuno/source/module/pyuno_impl.hxx
index 83fbda5..e066b73 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_PYUNO_SOURCE_MODULE_PYUNO_IMPL_HXX
#define INCLUDED_PYUNO_SOURCE_MODULE_PYUNO_IMPL_HXX
-#if defined(_MSC_VER) && (_MSC_VER >= 1600)
+#if defined(_MSC_VER)
// Workaround for some horrible hypot() mess
#include
#endif
diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx
index 918a9b5..9dacb26 100644
--- a/solenv/gcc-wrappers/wrapper.cxx
+++ b/solenv/gcc-wrappers/wrapper.cxx
@@ -118,9 +118,7 @@ string processccargs(vector rawargs) {
}
else if(*i == "-g") {
args.append("-Zi");
-#if _MSC_VER >= 1800
args.append(" -FS");
-#endif
Re: Summer of Code (March 17,2015)
On Wed, 2015-03-18 at 21:04 +0200, Efe Gürkan YALAMAN wrote: > > Somewhere in the bugzilla I think Caolan mentioned it can be > implemented as a tree-view because the options are in a tree structure > and it would fit better then a simple table. Also it solves the > dialog's usability issues too. I hope that will solve the > accessibility problems too. Yeah, I think that's the best approach, to try and use a tree in there. (a SvTreeList I suppose) because the amount of elements in the list is just crazy, 30,000+ IIRC. Ideally on-demand loaded, e.g. tree is collapsed and just shows +com.sun.star, when you expand that, then only then is the subtree inserted, and so on. So the full 30,000+ list isn't actually in the widget, only the expanded portion. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Crash test update
On Tue, 2015-03-17 at 10:40 +, Crashtest VM wrote: > New crashtest update available at > http://dev-builds.libreoffice.org/crashtest/ea7f16bf0b5e195d65e51c624b0fb37980bf2b95/ The hundreds of presentation import failures should now be fixed with http://cgit.freedesktop.org/libreoffice/core/commit/?id=8a5069cbaacf8a78ee66d6d8f2a46daefe1bec56 C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - configure.ac
configure.ac | 12 1 file changed, 12 insertions(+) New commits: commit be1e711aab64ec56f07fda40c4670c5415832a1c Author: Miklos Vajna Date: Thu Mar 19 10:08:26 2015 +0100 android: add a check for the installed memory in the machine ... and just error out with < 16G and all symbols. Should help newcomers who have e.g. 8GB of memory, build with dbgutil, but then unable to complete the build as the linker never finishes. Change-Id: I9f3ad5c6d76a18d6aa5b0b2d61aa115ed441b8e3 diff --git a/configure.ac b/configure.ac index e8d4fe8..57fcdb0 100644 --- a/configure.ac +++ b/configure.ac @@ -3858,6 +3858,18 @@ else fi AC_SUBST(ENABLE_SYMBOLS) +if test -n "$with_android_ndk" -a \( -n "$ENABLE_SYMBOLS" -o -n "$ENABLE_DEBUG" -o -n "$ENABLE_DBGUTIL" \) -a "$ENABLE_DEBUGINFO_FOR" = "all"; then +# Building on Android with full symbols: without enough memory the linker never finishes currently. +AC_MSG_CHECKING([whether enough memory is available for linking]) +mem_size=$(grep -o 'MemTotal: *.\+ kB' /proc/meminfo | sed 's/MemTotal: *\(.\+\) kB/\1/') +# Check for 15GB, as Linux reports a bit less than the physical memory size. +if test -n "$mem_size" -a $mem_size -lt 15728640; then +AC_MSG_ERROR([building with full symbols and less than 16GB of memory is not supported]) +else +AC_MSG_RESULT([yes]) +fi +fi + # Debug information format for iOS. Running dsymutil takes a long time... you really need a separate # .dSYM only if running Instruments, I think. (Not for normal debugging in Xcode.) To enable a # separate .dSYM, either use --enable-release-build or change manually to "DWARF with DSYM" in Xcode. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - libreofficekit/qa
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |8
1 file changed, 8 deletions(-)
New commits:
commit 060c443e2b0b400a376f9e6ae48f178c6c8ec173
Author: Miklos Vajna
Date: Thu Mar 19 10:43:46 2015 +0100
gtktiledviewer: remove unimplemented gtk-zoom-fit button
Change-Id: Iaecedd01d7e7bba90e49ddaa5f36859d9218242d
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 5b7fa65..755b3b2 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -73,10 +73,6 @@ void changeZoom( GtkWidget* pButton, gpointer /* pItem */ )
{
fZoom = 1;
}
-else if ( strcmp(sName, "gtk-zoom-fit") == 0)
-{
-// TODO -- will need access to lokdocview internals?
-}
else if ( strcmp(sName, "gtk-zoom-out") == 0)
{
for ( unsigned int i = 0; i < sizeof( fZooms ) / sizeof( fZooms[0] );
i++ )
@@ -287,10 +283,6 @@ int main( int argc, char* argv[] )
gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pZoom1, -1);
g_signal_connect( G_OBJECT(pZoom1), "clicked", G_CALLBACK(changeZoom),
NULL );
-GtkToolItem* pZoomFit = gtk_tool_button_new_from_stock( GTK_STOCK_ZOOM_FIT
);
-gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pZoomFit, -1);
-g_signal_connect( G_OBJECT(pZoomFit), "clicked", G_CALLBACK(changeZoom),
NULL );
-
GtkToolItem* pZoomOut = gtk_tool_button_new_from_stock( GTK_STOCK_ZOOM_OUT
);
gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pZoomOut, -1);
g_signal_connect( G_OBJECT(pZoomOut), "clicked", G_CALLBACK(changeZoom),
NULL );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: comphelper/source include/comphelper
comphelper/source/misc/mimeconfighelper.cxx | 10 --
include/comphelper/mimeconfighelper.hxx |2 +-
2 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 944d1fd5ca97969bc2cf45376737813c588f6637
Author: Caolán McNamara
Date: Thu Mar 19 10:21:05 2015 +
fix windows build and sal_Bool->bool
Change-Id: If88a5b1171ef0b586861dd071820bc993c4cf06e
diff --git a/comphelper/source/misc/mimeconfighelper.cxx
b/comphelper/source/misc/mimeconfighelper.cxx
index 17269a3..361cc00 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -696,23 +696,21 @@ SfxFilterFlags MimeConfigurationHelper::GetFilterFlags(
const OUString& aFilterN
return nFlags;
}
-sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
+bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
uno::Sequence< beans::PropertyValue >& aMediaDescr )
{
-sal_Bool bResult = sal_False;
-
OUString aFilterName = UpdateMediaDescriptorWithFilterName( aMediaDescr,
sal_False );
if ( !aFilterName.isEmpty() )
{
SfxFilterFlags nFlags = GetFilterFlags( aFilterName );
// check the OWN flag
-bResult = ( nFlags & SfxFilterFlags::OWN );
+return bool(nFlags & SfxFilterFlags::OWN);
}
-return bResult;
+return false;
}
-#endif
+#endif
OUString MimeConfigurationHelper::GetDefaultFilterFromServiceName( const
OUString& aServiceName, sal_Int32 nVersion )
{
diff --git a/include/comphelper/mimeconfighelper.hxx
b/include/comphelper/mimeconfighelper.hxx
index 5ba0eb9..4791109 100644
--- a/include/comphelper/mimeconfighelper.hxx
+++ b/include/comphelper/mimeconfighelper.hxx
@@ -115,7 +115,7 @@ public:
#ifdef WNT
SfxFilterFlags GetFilterFlags( const OUString& aFilterName );
-sal_Bool AddFilterNameCheckOwnFile(
+bool AddFilterNameCheckOwnFile(
::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& aMediaDescr );
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/bastyp/fltfnc.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0597e4be3eb1be2987db28507055126bc5a26421
Author: Caolán McNamara
Date: Thu Mar 19 10:25:39 2015 +
WaE: -Werror=maybe-uninitialized
Change-Id: I310099e8e12fb6440e98fbca97af512a4f872ac0
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 78d1897..e759875e 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -998,7 +998,7 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
}
else if ( lFilterProperties[nFilterProperty].Name == "Flags" )
{
-sal_Int32 nTmp;
+sal_Int32 nTmp(0);
lFilterProperties[nFilterProperty].Value >>= nTmp;
nFlags = static_cast(nTmp);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/app/dispatchwatcher.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b8d6062a120a70f155e296c72a856cde2c5d142c
Author: Noel Grandin
Date: Thu Mar 19 12:29:25 2015 +0200
fix android build
workaround template issue
Change-Id: Ifeb828685b3f63159249211aa32a90dcba2e5570
diff --git a/desktop/source/app/dispatchwatcher.cxx
b/desktop/source/app/dispatchwatcher.cxx
index c61aef3..c243766 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -97,7 +97,7 @@ const SfxFilter* impl_lookupExportFilterForUrl( const
rtl::OUString& rUrl, const
sQuery.append(":iflags=");
sQuery.append(OUString::number(static_cast(SfxFilterFlags::EXPORT)));
sQuery.append(":eflags=");
-
sQuery.append(OUString::number(static_cast(SFX_FILTER_NOTINSTALLED)));
+sQuery.append(OUString::number(static_cast(SFX_FILTER_NOTINSTALLED)));
const Reference< XComponentContext > xContext(
comphelper::getProcessComponentContext() );
const Reference< XContainerQuery > xFilterFactory(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/android
sal/android/uthash.h | 16
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit b18bd0b774436ad2a85b95491a3efd02c249
Author: Michaël Lefèvre
Date: Fri Mar 13 15:46:44 2015 +0100
CppCheck cleaning : scope reduction and printf format
Change-Id: I43ba76194ee135ffe2398267ed810cca116a1e43
Reviewed-on: https://gerrit.libreoffice.org/14854
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sal/android/uthash.h b/sal/android/uthash.h
index 0760469..fe9d13d 100644
--- a/sal/android/uthash.h
+++ b/sal/android/uthash.h
@@ -81,9 +81,9 @@ typedef unsigned int uint32_t;
#define HASH_FIND(hh,head,keyptr,keylen,out)
\
do {
\
- unsigned _hf_bkt,_hf_hashv;
\
out=NULL;
\
if (head) {
\
+ unsigned _hf_bkt,_hf_hashv;
\
HASH_FCN(keyptr,keylen, (head)->hh.tbl->num_buckets, _hf_hashv, _hf_bkt);
\
if (HASH_BLOOM_TEST((head)->hh.tbl, _hf_hashv)) {
\
HASH_FIND_IN_BKT((head)->hh.tbl, hh, (head)->hh.tbl->buckets[ _hf_bkt
], \
@@ -247,11 +247,11 @@ do {
#define HASH_OOPS(...) do { fprintf(stderr,__VA_ARGS__); exit(-1); } while (0)
#define HASH_FSCK(hh,head)
\
do {
\
-unsigned _bkt_i;
\
-unsigned _count, _bkt_count;
\
-char *_prev;
\
-struct UT_hash_handle *_thh;
\
if (head) {
\
+unsigned _bkt_i;
\
+unsigned _count, _bkt_count;
\
+char *_prev;
\
+struct UT_hash_handle *_thh;
\
_count = 0;
\
for( _bkt_i = 0; _bkt_i < (head)->hh.tbl->num_buckets; _bkt_i++) {
\
_bkt_count = 0;
\
@@ -268,12 +268,12 @@ do {
}
\
_count += _bkt_count;
\
if ((head)->hh.tbl->buckets[_bkt_i].count != _bkt_count) {
\
- HASH_OOPS("invalid bucket count %d, actual %d\n",
\
+ HASH_OOPS("invalid bucket count %d, actual %u\n",
\
(head)->hh.tbl->buckets[_bkt_i].count, _bkt_count);
\
}
\
}
\
if (_count != (head)->hh.tbl->num_items) {
\
-HASH_OOPS("invalid hh item count %d, actual %d\n",
\
+HASH_OOPS("invalid hh item count %d, actual %u\n",
\
(head)->hh.tbl->num_items, _count );
\
}
\
/* traverse hh in app order; check next/prev integrity, count */
\
@@ -291,7 +291,7 @@ do {
(head)->hh.tbl->hho) : NULL );
\
}
\
if (_count != (head)->hh.tbl->num_items) {
\
-HASH_OOPS("invalid app item count %d, actual %d\n",
\
+HASH_OOPS("invalid app item count %d, actual %u\n",
\
(head)->hh.tbl->num_items, _count );
\
}
\
}
\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/page.cxx | 16 1 file changed, 8 insertions(+), 8 deletions(-) New commits: commit 0b76f7ee3f7ac7c37c62b4d91307a20d9faca01a Author: Rishabh Kumar Date: Tue Mar 10 08:33:53 2015 +0530 tdf#86787: Page style margin limited to 99.99mm Normailizes MarginEdit before assigning values to SetMax and SetLast Change-Id: I2aa1eca75c36e8dd4ac5905b49d6802b5c763f85 Reviewed-on: https://gerrit.libreoffice.org/14821 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 80880c6..d321103 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -354,14 +354,14 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr m_pPaperHeightEdit->SetLast(m_pPaperHeightEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperHeight()), FUNIT_CM); // #i4219# also for margins (1/100th cm). Was: , keeping. -m_pLeftMarginEdit->SetMax(aDrawinglayerOpt.GetMaximumPaperLeftMargin()); -m_pLeftMarginEdit->SetLast(aDrawinglayerOpt.GetMaximumPaperLeftMargin()); -m_pRightMarginEdit->SetMax(aDrawinglayerOpt.GetMaximumPaperRightMargin()); -m_pRightMarginEdit->SetLast(aDrawinglayerOpt.GetMaximumPaperRightMargin()); -m_pTopMarginEdit->SetMax(aDrawinglayerOpt.GetMaximumPaperTopMargin()); -m_pTopMarginEdit->SetLast(aDrawinglayerOpt.GetMaximumPaperTopMargin()); - m_pBottomMarginEdit->SetMax(aDrawinglayerOpt.GetMaximumPaperBottomMargin()); - m_pBottomMarginEdit->SetLast(aDrawinglayerOpt.GetMaximumPaperBottomMargin()); + m_pLeftMarginEdit->SetMax(m_pLeftMarginEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperLeftMargin()), FUNIT_MM); + m_pLeftMarginEdit->SetLast(m_pLeftMarginEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperLeftMargin()), FUNIT_MM); + m_pRightMarginEdit->SetMax(m_pRightMarginEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperRightMargin()), FUNIT_MM); + m_pRightMarginEdit->SetLast(m_pRightMarginEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperRightMargin()), FUNIT_MM); + m_pTopMarginEdit->SetMax(m_pTopMarginEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperTopMargin()), FUNIT_MM); + m_pTopMarginEdit->SetLast(m_pTopMarginEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperTopMargin()), FUNIT_MM); + m_pBottomMarginEdit->SetMax(m_pBottomMarginEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperBottomMargin()), FUNIT_MM); + m_pBottomMarginEdit->SetLast(m_pBottomMarginEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperBottomMargin()), FUNIT_MM); m_pPortraitBtn->SetAccessibleRelationMemberOf(m_pOrientationFT); m_pLandscapeBtn->SetAccessibleRelationMemberOf(m_pOrientationFT); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/generic
vcl/generic/glyphs/scrptrun.cxx | 155 +++-
vcl/generic/glyphs/scrptrun.h | 10 --
2 files changed, 75 insertions(+), 90 deletions(-)
New commits:
commit b9880e49e5fbae377eca82e60b88cbbdca8bd5d2
Author: Noel Grandin
Date: Wed Mar 11 13:55:51 2015 +0200
Speed up ScriptRun::getPairIndex
Noted as a hot spot in the callgrind of
test-files/loperf/091_fdo#39372.odt
The idea for the lookup tables is credited to mjayfrancis.
This takes it from 1.8 billion instructions to 1.1 billion instructions.
This change has been submitted upstream (along with other changes
to these source files that have not yet been pushed there)
in ICU ticket:
http://bugs.icu-project.org/trac/ticket/11577
Change-Id: I917bdea4263320f9e88207657b7f3140d95ae2b8
Reviewed-on: https://gerrit.libreoffice.org/14834
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/generic/glyphs/scrptrun.cxx b/vcl/generic/glyphs/scrptrun.cxx
index cd7ce41..d6557d7 100644
--- a/vcl/generic/glyphs/scrptrun.cxx
+++ b/vcl/generic/glyphs/scrptrun.cxx
@@ -33,103 +33,98 @@
* created on: 10/17/2001
* created by: Eric R. Mader
*/
-
+/**
+ * This file is largely copied from the ICU project,
+ * under folder source/extra/scrptrun/scrptrun.cpp
+ */
#include "unicode/utypes.h"
#include "unicode/uscript.h"
#include "scrptrun.h"
+#include
-#define ARRAY_SIZE(array) (sizeof array / sizeof array[0])
-
-namespace vcl {
-
-const char ScriptRun::fgClassID=0;
-
-UChar32 ScriptRun::pairedChars[] = {
-0x0028, 0x0029, // ascii paired punctuation
-0x003c, 0x003e,
-0x005b, 0x005d,
-0x007b, 0x007d,
-0x00ab, 0x00bb, // guillemets
-0x2018, 0x2019, // general punctuation
-0x201c, 0x201d,
-0x2039, 0x203a,
-0x3008, 0x3009, // chinese paired punctuation
-0x300a, 0x300b,
-0x300c, 0x300d,
-0x300e, 0x300f,
-0x3010, 0x3011,
-0x3014, 0x3015,
-0x3016, 0x3017,
-0x3018, 0x3019,
-0x301a, 0x301b
-};
-
-const int32_t ScriptRun::pairedCharCount = ARRAY_SIZE(pairedChars);
-const int32_t ScriptRun::pairedCharPower = 1 << highBit(pairedCharCount);
-const int32_t ScriptRun::pairedCharExtra = pairedCharCount - pairedCharPower;
+namespace {
-int8_t ScriptRun::highBit(int32_t value)
+struct PairIndices
{
-if (value <= 0) {
-return -32;
-}
-
-int8_t bit = 0;
-
-if (value >= 1 << 16) {
-value >>= 16;
-bit += 16;
+int8_t ma00[0xff];
+int8_t ma20[0x7f];
+int8_t ma30[0x7f];
+
+PairIndices()
+{
+std::fill_n(ma00, 0xff, -1);
+std::fill_n(ma20, 0x7f, -1);
+std::fill_n(ma30, 0x7f, -1);
+
+// characters in the range 0x - 0x007e (inclusive)
+// ascii paired punctuation
+ma00[0x28] = 0;
+ma00[0x29] = 1;
+ma00[0x3c] = 2;
+ma00[0x3e] = 3;
+ma00[0x5b] = 4;
+ma00[0x5d] = 5;
+ma00[0x7b] = 6;
+ma00[0x7d] = 7;
+// guillemets
+ma00[0xab] = 8;
+ma00[0xbb] = 9;
+
+// characters in the range 0x2000 - 0x207e (inclusive)
+// general punctuation
+ma20[0x18] = 10;
+ma20[0x19] = 11;
+ma20[0x1c] = 12;
+ma20[0x1d] = 13;
+ma20[0x39] = 14;
+ma20[0x3a] = 15;
+
+// characters in the range 0x3000 - 0x307e (inclusive)
+// chinese paired punctuation
+ma30[0x08] = 16;
+ma30[0x09] = 17;
+ma30[0x0a] = 18;
+ma30[0x0b] = 19;
+ma30[0x0c] = 20;
+ma30[0x0d] = 21;
+ma30[0x0e] = 22;
+ma30[0x0f] = 23;
+ma30[0x10] = 24;
+ma30[0x11] = 25;
+ma30[0x14] = 26;
+ma30[0x15] = 27;
+ma30[0x16] = 28;
+ma30[0x17] = 29;
+ma30[0x18] = 30;
+ma30[0x19] = 31;
+ma30[0x1a] = 32;
+ma30[0x1b] = 33;
}
-if (value >= 1 << 8) {
-value >>= 8;
-bit += 8;
+inline int32_t getPairIndex(UChar32 ch) const
+{
+if (ch < 0xff)
+return ma00[ch];
+if (ch >= 0x2000 && ch < 0x207f)
+return ma20[ch - 0x2000];
+if (ch >= 0x3000 && ch < 0x307f)
+return ma30[ch - 0x3000];
+return -1;
}
-if (value >= 1 << 4) {
-value >>= 4;
-bit += 4;
-}
-
-if (value >= 1 << 2) {
-value >>= 2;
-bit += 2;
-}
-
-if (value >= 1 << 1) {
-value >>= 1;
-bit += 1;
-}
+};
-return bit;
}
-int32_t ScriptRun::getPairIndex(UChar32 ch)
-{
-int32_t probe = pairedCharPower;
-int32_t index = 0;
+static const PairIndices gPairIndices;
-if (ch >= pairedChars[pairedCharExtra]) {
-index = pairedCharExtra;
-}
-
-while (probe > (1 << 0)) {
-probe >>= 1;
-if (ch >= pairedChars[index + probe]) {
-index += probe;
-
[Libreoffice-commits] core.git: filter/source
filter/source/config/cache/typedetection.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit c83476ab28544c25ab72e7e51131ab481bcbcc5d
Author: Michaël Lefèvre
Date: Fri Mar 13 16:34:28 2015 +0100
CppCheck cleaning : unnecessary assignment
Change-Id: I1e2562631f37befc75879a8095740835f050afb2
Reviewed-on: https://gerrit.libreoffice.org/14856
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/filter/source/config/cache/typedetection.cxx
b/filter/source/config/cache/typedetection.cxx
index 15ba4d0..a9d1ebd 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -705,7 +705,6 @@ bool TypeDetection::impl_getPreselectionForType(
WildCard aCheck(*pIt);
if (aCheck.Matches(aParsedURL.Main))
{
-bBreakDetection= true;
bMatchByPattern= true;
break;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - stoc/source
stoc/source/inspect/introspection.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c44a8dee64021e15fcd9ff2294176d27d665a5f4
Author: Michael Stahl
Date: Fri Mar 13 18:43:21 2015 +0100
stoc: must check *both* bDisposed and bInDispose
Implementation::inspect() was crashing with a null reflection_ in
CppunitTest_libreofficekit_tiledrendering because another thread
was disposing it.
Actually, why are there 2 bools for this and not one enum with 3 values?
Change-Id: Icd27145d3203e1f48a9841ee6251a50cb73f7988
(cherry picked from commit d19249c66d13c779a4a46f34e1d8094c74bbb20f)
Reviewed-on: https://gerrit.libreoffice.org/14860
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/stoc/source/inspect/introspection.cxx
b/stoc/source/inspect/introspection.cxx
index bd76197..4805aa5 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -1599,7 +1599,7 @@ css::uno::Reference
Implementation::inspect(
throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(m_aMutex);
-if (rBHelper.bDisposed) {
+if (rBHelper.bDisposed || rBHelper.bInDispose) {
throw css::lang::DisposedException(
getImplementationName(), static_cast(this));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source
sw/source/filter/ww8/ww8par5.cxx | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit d66458347f552cbd436d82700626d45eeb1f80fb
Author: Justin Luth
Date: Tue Mar 10 13:12:30 2015 +0300
tdf#68963 avoid __refheading__ regression reported in tdf#89482
bugfix tdf#68963 (scheduled for 4.3.7) marked all __refheading__ bookmarks
at TOC, but those crossreferences were deleted if they are not recorded in
aReferencedTOCBookmarks.
I decided to NOT introduce the full fix (which allows LO to author
a .doc with working cross-references) into the stable 4.3 branch to ensure
there are no further regressions. This patch both avoids a regression and
allows sharing of crossref documents authored in LO 4.4.2+.
Change-Id: I5d8b979bf1b884cbf74b31d875dc7c80a6c4b903
Reviewed-on: https://gerrit.libreoffice.org/14865
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index e4f9a6f..4b35205 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -100,7 +100,7 @@ namespace
// #120879# - helper method to identify a bookmark name to match the
internal TOC bookmark naming convention
bool IsTOCBookmarkName( const ::rtl::OUString& rName )
{
-return rName.startsWith("_Toc") ||
rName.startsWith(IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix());
+return rName.startsWith("_Toc") ||
rName.startsWith(IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix()+"_Toc");
}
::rtl::OUString EnsureTOCBookmarkName( const ::rtl::OUString& rName )
@@ -1960,6 +1960,15 @@ eF_ResT SwWW8ImplReader::Read_F_Ref( WW8FieldDesc*,
OUString& rStr )
OUString sBkmName(GetMappedBookmark(sOrigBkmName));
+// #i120879# add cross reference bookmark name prefix, if it
+// matches internal TOC bookmark naming convention
+if ( IsTOCBookmarkName( sBkmName ) )
+{
+sBkmName = EnsureTOCBookmarkName(sBkmName);
+// track as referenced TOC bookmark.
+pReffedStck->aReferencedTOCBookmarks.insert( sBkmName );
+}
+
SwGetRefField aFld(
(SwGetRefFieldType*)rDoc.GetSysFldType( RES_GETREFFLD ),
sBkmName,REF_BOOKMARK,0,eFormat);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/qa sw/source
dev/null |binary
sw/source/core/crsr/crossrefbookmark.cxx |2 +-
sw/source/filter/ww8/ww8par5.cxx | 11 ++-
3 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 92a43d05d14b1ab7b8bfb4052874d0f0e6c62ef9
Author: Justin Luth
Date: Mon Mar 9 15:26:14 2015 +0300
tdf#89482 fix __refheading__ regression, set only CrossRefs as TOC.
bugfix tdf#68963 marked all __refheading__ bookmarks at TOC, but
those crossreferences were deleted if they are not recorded in
aReferencedTOCBookmarks. Redesigned the fix to include _Toc in the
crossreference name that is auto-generated, which is how MSWord
differentiates the markers.
Change-Id: Ic5bdc4b475f2eb7963cbcf3bf0ec74337daef5be
Reviewed-on: https://gerrit.libreoffice.org/14864
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/qa/extras/ww8import/data/fdo68963.doc
b/sw/qa/extras/ww8import/data/fdo68963.doc
deleted file mode 100644
index 4b331f0..000
Binary files a/sw/qa/extras/ww8import/data/fdo68963.doc and /dev/null differ
diff --git a/sw/source/core/crsr/crossrefbookmark.cxx
b/sw/source/core/crsr/crossrefbookmark.cxx
index 700a3f2..67a25d0 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -72,7 +72,7 @@ namespace sw { namespace mark
const vcl::KeyCode& rCode,
const OUString& rName,
const OUString& rShortName)
-: CrossRefBookmark(rPaM, rCode, rName, rShortName,
IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix())
+: CrossRefBookmark(rPaM, rCode, rName, rShortName,
IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix()+"_Toc")
{ }
bool CrossRefHeadingBookmark::IsLegalName(const OUString& rName)
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 246d3f6..bbde7d7 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -102,7 +102,7 @@ namespace
// #120879# - helper method to identify a bookmark name to match the
internal TOC bookmark naming convention
bool IsTOCBookmarkName( const ::rtl::OUString& rName )
{
-return rName.startsWith("_Toc") ||
rName.startsWith(IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix());
+return rName.startsWith("_Toc") ||
rName.startsWith(IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix()+"_Toc");
}
::rtl::OUString EnsureTOCBookmarkName( const ::rtl::OUString& rName )
@@ -1970,6 +1970,15 @@ eF_ResT SwWW8ImplReader::Read_F_Ref( WW8FieldDesc*,
OUString& rStr )
OUString sBkmName(GetMappedBookmark(sOrigBkmName));
+// #i120879# add cross reference bookmark name prefix, if it
+// matches internal TOC bookmark naming convention
+if ( IsTOCBookmarkName( sBkmName ) )
+{
+sBkmName = EnsureTOCBookmarkName(sBkmName);
+// track as referenced TOC bookmark.
+pReffedStck->aReferencedTOCBookmarks.insert( sBkmName );
+}
+
SwGetRefField aFld(
(SwGetRefFieldType*)rDoc.getIDocumentFieldsAccess().GetSysFldType(
RES_GETREFFLD ),
sBkmName,REF_BOOKMARK,0,eFormat);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - editeng/source
editeng/source/misc/acorrcfg.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 32a466e6a95723f26d20a20e74d1f0e563d5dbca Author: Michael Stahl Date: Tue Mar 10 23:56:55 2015 +0100 tdf#89867: editeng: fix crash on shutdown after changing AutoCorrect options Since commit 5bff4b016c4b44f4123e0e6a4fd4c0c4dc0cfa2d the SvxAutoCorrCfg::pAutoCorrect is cleared by one terminate() listener but then another terminate() listener calls Commit() on all modified utl::ConfigItem and these two have a Commit() that does not clear the modified flag so they are always modified. Sadly there's no non-virtual Commit() wrapper that calls ClearModified() on the base class... Change-Id: I9ae220d78bb109c7bf0fdc544754a0686b357115 (cherry picked from commit d1698027e9f1c4a88b17da7357f257be3cfb7c1a) Reviewed-on: https://gerrit.libreoffice.org/14828 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx index dce7df4..9ca989c 100644 --- a/editeng/source/misc/acorrcfg.cxx +++ b/editeng/source/misc/acorrcfg.cxx @@ -321,6 +321,7 @@ void SvxBaseAutoCorrCfg::Commit() } } PutProperties(aNames, aValues); +ClearModified(); } void SvxBaseAutoCorrCfg::Notify( const Sequence& /* aPropertyNames */) @@ -640,6 +641,7 @@ void SvxSwAutoCorrCfg::Commit() } } PutProperties(aNames, aValues); +ClearModified(); } void SvxSwAutoCorrCfg::Notify( const Sequence& /* aPropertyNames */ ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - i18npool/source
i18npool/source/search/textsearch.cxx | 25 +
1 file changed, 21 insertions(+), 4 deletions(-)
New commits:
commit afae8d1e9eb37265bd356773caa77d6d8ac481bc
Author: Michael Stahl
Date: Tue Mar 10 23:19:18 2015 +0100
i18npool: fix spurious regex ^ matching in TextSearch::searchForward()
Thanks to Eike for finding this:
The anchors ^ and $ now anchor at the selection boundary because the
only text the regex matcher gets passed is the selected text. This in
two paragraphs
aaa bbb aaa bbb
aaa bbb aaa bbb
when the selection spans from the second aaa to the third bbb, for
"^aaa" finds the second aaa, where previously it found the third aaa at
the real paragraph start.
This may not be expected by the user, because the behavior of ^ is
described as "Match at the beginning of a line" (or paragraph in our
case), which the previous implementation did.
(regression from 806ced87cfe3da72df0d8e4faf5b82535fc7d1b7)
Unfortunately it's not obvious how to implement the same in
searchBackward().
Change-Id: I07f7a8476b672d9511fa74ca473c32eea427698f
(cherry picked from commit 9aae521b451269007f03527c83645b8b935eb419)
Reviewed-on: https://gerrit.libreoffice.org/14829
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/i18npool/source/search/textsearch.cxx
b/i18npool/source/search/textsearch.cxx
index 959227df..094b554 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -242,13 +242,26 @@ SearchResult TextSearch::searchForward( const OUString&
searchStr, sal_Int32 sta
in_str = xTranslit->transliterate( searchStr, startPos, endPos -
startPos, offset );
// JP 20.6.2001: also the start and end positions must be corrected!
-sal_Int32 const newStartPos =
+sal_Int32 newStartPos =
(startPos == 0) ? 0 : FindPosInSeq_Impl( offset, startPos );
-sal_Int32 const newEndPos = (endPos < searchStr.getLength())
+sal_Int32 newEndPos = (endPos < searchStr.getLength())
? FindPosInSeq_Impl( offset, endPos )
: in_str.getLength();
+sal_Int32 nExtraOffset = 0;
+if (pRegexMatcher && startPos > 0)
+{
+// avoid matching ^ here - in_str omits a prefix of the searchStr
+// this is a really lame way to do it, but ICU only offers
+// useAnchoringBounds() to disable *both* bounds but what is needed
+// here is to disable only one bound and respect the other
+in_str = "X" + in_str;
+nExtraOffset = 1;
+newStartPos += nExtraOffset;
+newEndPos += nExtraOffset;
+}
+
sres = (this->*fnForward)( in_str, newStartPos, newEndPos );
// Map offsets back to untransliterated string.
@@ -260,14 +273,14 @@ SearchResult TextSearch::searchForward( const OUString&
searchStr, sal_Int32 sta
const sal_Int32 nGroups = sres.startOffset.getLength();
for ( sal_Int32 k = 0; k < nGroups; k++ )
{
-const sal_Int32 nStart = sres.startOffset[k];
+const sal_Int32 nStart = sres.startOffset[k] - nExtraOffset;
if (startPos > 0 || nStart > 0)
sres.startOffset[k] = (nStart < nOffsets ? offset[nStart]
: (offset[nOffsets - 1] + 1));
// JP 20.6.2001: end is ever exclusive and then don't return
// the position of the next character - return
the
// next position behind the last found character!
// "a b c" find "b" must return 2,3 and not
2,4!!!
-const sal_Int32 nStop = sres.endOffset[k];
+const sal_Int32 nStop = sres.endOffset[k] - nExtraOffset;
if (startPos > 0 || nStop > 0)
sres.endOffset[k] = offset[(nStop <= nOffsets ? nStop :
nOffsets) - 1] + 1;
}
@@ -345,6 +358,10 @@ SearchResult TextSearch::searchBackward( const OUString&
searchStr, sal_Int32 st
sal_Int32 const newEndPos =
(endPos == 0) ? 0 : FindPosInSeq_Impl( offset, endPos );
+// TODO: this would need nExtraOffset handling to avoid $ matching
+// if (pRegexMatcher && startPos < searchStr.getLength())
+// but that appears to be impossible with ICU regex
+
sres = (this->*fnBackward)( in_str, newStartPos, newEndPos );
// Map offsets back to untransliterated string.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/field.cxx | 18 +++---
1 file changed, 15 insertions(+), 3 deletions(-)
New commits:
commit 591e34f868cc3a3f3ce7927480d224f137bfd83c
Author: Laszlo Kis-Adam
Date: Thu Mar 12 17:44:01 2015 +0100
Support "a/b" style of fractions, not just "a b/c" style. Also fixes a
crash.
Change-Id: I67f57fc09be512b8827ce2b62ba8828e23f544bc
Reviewed-on: https://gerrit.libreoffice.org/14842
Tested-by: Jenkins
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index fc83af0..cab79f5 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -115,9 +115,21 @@ static bool ImplNumericGetValue( const OUString& rStr,
sal_Int64& rValue,
{
bFrac = true;
nFracNumPos = aStr.lastIndexOf(' ', nFracDivPos);
-aStr1.append(aStr.getStr(), nFracNumPos);
-aStrNum.append(aStr.getStr()+nFracNumPos+1, nFracDivPos-nFracNumPos-1);
-aStrDenom.append(aStr.getStr()+nFracDivPos+1);
+
+// If in "a b/c" format.
+if(nFracNumPos != -1 )
+{
+aStr1.append(aStr.getStr(), nFracNumPos);
+aStrNum.append(aStr.getStr()+nFracNumPos+1,
nFracDivPos-nFracNumPos-1);
+aStrDenom.append(aStr.getStr()+nFracDivPos+1);
+}
+// "a/b" format, or not a fraction at all
+else
+{
+aStrNum.append(aStr.getStr(), nFracDivPos);
+aStrDenom.append(aStr.getStr()+nFracDivPos+1);
+}
+
}
// parse decimal strings
else if ( nDecPos >= 0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/stbctrls/stbctrls.src | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit d6e839e9e4ce5470c304dbe2b87dd8b0bb07db59
Author: Adolfo Jayme Barrientos
Date: Fri Mar 6 05:05:43 2015 -0600
Percentages should also be translatableâ¦
as they are not written the same way in all languages.
Change-Id: Ibc3a5963bf8bd737516a003618befd1de5f3f5ca
Reviewed-on: https://gerrit.libreoffice.org/14767
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index 3ad69cf..ac26b26 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -168,31 +168,31 @@ Menu RID_SVXMNU_ZOOM
{
Identifier = ZOOM_50 ;
HelpId = HID_MNU_ZOOM_50 ;
-Text = "50%" ;
+Text [ en-US ] = "50%" ;
};
MenuItem
{
Identifier = ZOOM_75 ;
HelpId = HID_MNU_ZOOM_75 ;
-text = "75%" ;
+Text [ en-US ] = "75%" ;
};
MenuItem
{
Identifier = ZOOM_100 ;
HelpId = HID_MNU_ZOOM_100 ;
-Text = "100%" ;
+Text [ en-US ] = "100%" ;
};
MenuItem
{
Identifier = ZOOM_150 ;
HelpId = HID_MNU_ZOOM_150 ;
-Text = "150%" ;
+Text [ en-US ] = "150%" ;
};
MenuItem
{
Identifier = ZOOM_200 ;
HelpId = HID_MNU_ZOOM_200 ;
-Text = "200%" ;
+Text [ en-US ] = "200%" ;
};
};
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/options/optsave.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 4582eabb00494b0e29a899e78084ebac895c64a8 Author: Caolán McNamara Date: Thu Mar 19 11:13:44 2015 + push build along a bit further Change-Id: I6b662e8588153a9437615de0652e3169fc867b82 diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 312aa12..2767ef9 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -403,9 +403,9 @@ void SfxSaveTabPage::Reset( const SfxItemSet* ) sal_IntPtr nData = reinterpret_cast(aDocTypeLB->GetEntryData(n)); OUString sCommand; sCommand = "matchByDocumentService=%1:iflags=" + - OUString::number(static_cast(SfxFilterFlags::IMPORT|SfxFilterFlags::EXPORT)) + + OUString::number(static_cast(SfxFilterFlags::IMPORT|SfxFilterFlags::EXPORT)) + ":eflags=" + - OUString::number(static_cast(SfxFilterFlags::NOTINFILEDLG)) + + OUString::number(static_cast(SfxFilterFlags::NOTINFILEDLG)) + ":default_first"; OUString sReplace; switch(nData) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Payment from FS for fixing tdf#58723
Hi, I've sponsored an issue on freedomsponsors.org for fixing https://bugs.documentfoundation.org/show_bug.cgi?id=58723 . (see https://freedomsponsors.org/issue/429/editing-partial-acceptance-or-rejection-of-the-changes) Now i see tht the bug is fixed but there is no notification on the report about the comit and i don't know who fixed it. Not much, it is only USD.20 but i want to pay it -just consider having some beers or coffee from me for this great enchancemet :) If you know who fixed it, or you are the one please contact with me, otherwise i'll donate the reward to TDF. Thanks again. Best regards, Zeki ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/vclref' - chart2/source editeng/source include/sfx2 include/svx sc/inc sc/source sd/inc sd/source starmath/inc starmath/source sw/source
chart2/source/inc/chartview/DrawModelWrapper.hxx |2
chart2/source/view/main/DrawModelWrapper.cxx |4
editeng/source/editeng/impedit.hxx | 14 --
editeng/source/editeng/impedit2.cxx |6 -
include/sfx2/objsh.hxx |2
include/svx/svdmodel.hxx |4
sc/inc/document.hxx |4
sc/source/core/data/documen2.cxx |4
sc/source/core/data/documen8.cxx |6 -
sc/source/ui/dbgui/csvgrid.cxx | 136 +++
sc/source/ui/docshell/sizedev.cxx|2
sc/source/ui/inc/csvgrid.hxx |4
sc/source/ui/inc/output.hxx |6 -
sc/source/ui/inc/sizedev.hxx | 12 +-
sd/inc/sdmod.hxx |2
sd/source/ui/app/sdmod.cxx |2
sd/source/ui/docshell/docshel4.cxx |8 -
sd/source/ui/docshell/docshell.cxx |2
sd/source/ui/inc/DrawDocShell.hxx|2
starmath/inc/document.hxx| 12 +-
starmath/source/document.cxx |6 -
sw/source/core/doc/DocumentDeviceManager.cxx | 22 +--
sw/source/core/inc/DocumentDeviceManager.hxx |6 -
23 files changed, 134 insertions(+), 134 deletions(-)
New commits:
commit 3eb193aed1e3fcf3ab7cc0c687960aca7a26a50f
Author: Michael Meeks
Date: Wed Mar 18 20:52:22 2015 +
start of unwinding reference OutputDevice & Printer lifecycle.
Change-Id: I066337f46a3c39d1eaba5e7a1f4e1278816a0b27
diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx
b/chart2/source/inc/chartview/DrawModelWrapper.hxx
index 986a6b9..0e590a6 100644
--- a/chart2/source/inc/chartview/DrawModelWrapper.hxx
+++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx
@@ -41,7 +41,7 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >
m_xMainDrawPage;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >
m_xHiddenDrawPage;
-boost::scoped_ptr m_pRefDevice;
+VclPtr m_pRefDevice;
//no default constructor
DrawModelWrapper();
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx
b/chart2/source/view/main/DrawModelWrapper.cxx
index d917ee1..c65af68 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -150,7 +150,8 @@ DrawModelWrapper::DrawModelWrapper( const
uno::Reference
OutputDevice* pDefaultDevice = rOutliner.GetRefDevice();
if( !pDefaultDevice )
pDefaultDevice = Application::GetDefaultDevice();
-m_pRefDevice.reset(new VirtualDevice(*pDefaultDevice));
+m_pRefDevice.disposeAndClear();
+m_pRefDevice = new VirtualDevice(*pDefaultDevice);
MapMode aMapMode = m_pRefDevice->GetMapMode();
aMapMode.SetMapUnit(MAP_100TH_MM);
m_pRefDevice->SetMapMode(aMapMode);
@@ -176,6 +177,7 @@ DrawModelWrapper::~DrawModelWrapper()
}
SfxItemPool::Free(m_pChartItemPool);
}
+m_pRefDevice.disposeAndClear();
}
uno::Reference< uno::XInterface > DrawModelWrapper
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 9d644cf..e193dbd 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -408,8 +408,8 @@ private:
SfxStyleSheetPool* pStylePool;
SfxItemPool*pTextObjectPool;
-VirtualDevice* pVirtDev;
-OutputDevice* pRefDev;
+VclPtr< VirtualDevice> pVirtDev;
+VclPtr< OutputDevice > pRefDev;
svtools::ColorConfig* pColorConfig;
mutable SvtCTLOptions* pCTLOptions;
@@ -651,7 +651,7 @@ private:
boolIsForceAutoColor() const { return bForceAutoColor; }
inline VirtualDevice* GetVirtualDevice( const MapMode& rMapMode,
sal_uLong nDrawMode );
-inline void EraseVirtualDevice();
+inline void EraseVirtualDevice() { pVirtDev.disposeAndClear();
}
DECL_LINK(StatusTimerHdl, void *);
DECL_LINK(IdleFormatHdl, void *);
@@ -862,7 +862,7 @@ public:
voidUpdateParagraphsWithStyleSheet( SfxStyleSheet* pStyle
);
voidRemoveStyleFromParagraphs( SfxStyleSheet* pStyle );
-OutputDevice* GetRefDevice() const { return pRefDev; }
+OutputDevice* GetRefDevice() const { return pRefDev.get(); }
voidSetRefDevice( OutputDevice* pRefDef );
const MapMode& GetRefMapMode() { return pRefDev->GetMapMode(); }
@@ -1072,12 +1072,6 @@ inline VirtualDevice* ImpEditEngine::GetVirtualDevice(
const MapMode& rMapMode,
return pVirtDev;
}
-inline void ImpEditEngine::EraseVirtualDevice()
-{
-delete pVirtDev;
-pVirtDev = 0;
-}
-
inline void ImpEditEngine::IdleFormatAndUpdate( EditView* pCurView )
{
aIdleFormatter.DoI
[Libreoffice-commits] core.git: Branch 'feature/vclref' - 3 commits - canvas/source compilerplugins/clang cppcanvas/source desktop/source drawinglayer/source editeng/source include/editeng include/svt
canvas/source/vcl/bitmapbackbuffer.hxx |2 canvas/source/vcl/impltools.hxx |2 compilerplugins/clang/vclwidgets.cxx | 112 +++--- cppcanvas/source/mtfrenderer/implrenderer.cxx| 12 cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 14 desktop/source/splash/splash.cxx |4 drawinglayer/source/primitive2d/controlprimitive2d.cxx |8 drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx | 48 +- drawinglayer/source/primitive2d/textlayoutdevice.cxx |4 drawinglayer/source/processor2d/vclhelperbufferdevice.cxx|8 drawinglayer/source/processor2d/vclhelperbufferdevice.hxx|6 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 40 +- drawinglayer/source/processor2d/vclprocessor2d.hxx |3 drawinglayer/source/tools/converters.cxx | 24 - editeng/source/editeng/editeng.cxx |4 editeng/source/editeng/impedit.hxx |2 editeng/source/items/svxfont.cxx |2 include/editeng/outliner.hxx |3 include/svtools/ctrlbox.hxx |2 include/svtools/ctrltool.hxx |4 include/svtools/prnsetup.hxx |6 include/svtools/ruler.hxx|2 include/svtools/valueset.hxx |2 include/toolkit/awt/vclxgraphics.hxx |3 include/vcl/animate.hxx |9 include/vcl/decoview.hxx |3 include/vcl/event.hxx|4 include/vcl/gdimtf.hxx |3 include/vcl/outdev.hxx |6 include/vcl/print.hxx|9 include/vcl/texteng.hxx |3 include/vcl/vclptr.hxx | 48 ++ include/vcl/virdev.hxx |4 include/vcl/window.hxx |2 svtools/source/contnr/imivctl.hxx|8 svtools/source/contnr/imivctl1.cxx | 16 svtools/source/control/ctrlbox.cxx | 29 - svtools/source/control/ctrltool.cxx |2 svtools/source/control/ruler.cxx | 98 ++--- svtools/source/control/valueset.cxx | 74 ++-- svtools/source/dialogs/prnsetup.cxx |9 svtools/source/graphic/grfmgr2.cxx | 16 svtools/source/graphic/provider.cxx | 16 svtools/source/inc/renderer.hxx |2 svtools/source/misc/sampletext.cxx | 14 svtools/source/table/gridtablerenderer.cxx |8 svtools/source/toolpanel/paneltabbar.cxx | 24 - svtools/source/toolpanel/toolpaneldrawer.hxx |2 vcl/inc/brdwin.hxx |8 vcl/inc/controldata.hxx |2 vcl/inc/outdev.h |3 vcl/inc/printdlg.hxx |2 vcl/inc/svdata.hxx | 20 - vcl/inc/window.h |2 vcl/source/app/svdata.cxx|2 vcl/source/edit/texteng.cxx |2 vcl/source/edit/textview.cxx |7 vcl/source/filter/graphicfilter.cxx | 16 vcl/source/filter/sgfbram.cxx| 14 vcl/source/filter/sgvmain.cxx|4 vcl/source/filter/sgvtext.cxx| 16 vcl/source/filter/wmf/emfwr.cxx | 114 +++--- vcl/source/filter/wmf/emfwr.hxx |2 vcl/source/filter/wmf/wmfwr.cxx |2 vcl/source/filter/wmf/wmfwr.hxx |2 vcl/source/gdi/animate.cxx |6 vcl/source/gdi/bitmapex.cxx | 14 vcl/source/gdi/cvtsvm.cxx| 26 - vcl/source/gdi/gdimetafiletools.cxx | 20 - vcl/source/gdi/gdimtf.cxx| 180 +-- vcl/source/gdi/impanmvw.cxx
[Libreoffice-commits] core.git: include/LibreOfficeKit
include/LibreOfficeKit/LibreOfficeKit.h | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 2a9bd88e427c0646566ca988bb23e7dab25744c1 Author: Tor Lillqvist Date: Thu Mar 19 13:58:12 2015 +0200 Indent parameter lists consistently. Other inconsistencies in spacing and alignment remain, though. Change-Id: I2b4f9e34781288c5146518be853d3831ec32e968 diff --git a/include/LibreOfficeKit/LibreOfficeKit.h b/include/LibreOfficeKit/LibreOfficeKit.h index f10e5e3..85f760c 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.h +++ b/include/LibreOfficeKit/LibreOfficeKit.h @@ -136,14 +136,14 @@ struct _LibreOfficeKitDocumentClass /// @see lok::Document::setTextSelection void (*setTextSelection)(LibreOfficeKitDocument* pThis, - int nType, - int nX, - int nY); + int nType, + int nX, + int nY); /// @see lok::Document::setGraphicSelection void (*setGraphicSelection)(LibreOfficeKitDocument* pThis, - int nType, - int nX, - int nY); + int nType, + int nX, + int nY); /// @see lok::Document::resetSelection void (*resetSelection)(LibreOfficeKitDocument* pThis); #endif // LOK_USE_UNSTABLE_API ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/vclref' - sd/source
sd/source/ui/docshell/docshel4.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 94ba923808ff8ed6fe893b0a85d27b41eccec3f8
Author: Michael Meeks
Date: Thu Mar 19 12:12:46 2015 +
compile fixes.
Change-Id: I210c71c1a7236d286256a498f3f4f28f4185d052
diff --git a/sd/source/ui/docshell/docshel4.cxx
b/sd/source/ui/docshell/docshel4.cxx
index 951b8d5..58c2bda 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -145,10 +145,8 @@ void DrawDocShell::SetPrinter(SfxPrinter *pNewPrinter)
pView->SdrEndTextEdit();
}
-if ( mpPrinter && mbOwnPrinter && (mpPrinter != pNewPrinter) )
-{
+if ( mpPrinter && mbOwnPrinter && (mpPrinter.get() != pNewPrinter) )
mpPrinter.disposeAndClear();
-}
mpPrinter = pNewPrinter;
mbOwnPrinter = true;
@@ -222,7 +220,7 @@ void DrawDocShell::UpdateRefDevice()
// as a fall-back.
DBG_ASSERT(false, "DrawDocShell::UpdateRefDevice(): Unexpected
printer layout mode");
-pRefDevice = mpPrinter;
+pRefDevice = mpPrinter.get();
break;
}
mpDoc->SetRefDevice( pRefDevice.get() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/helper/qahelper.hxx | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 98c532b38589945717ff17ed344a358479074e5b Author: Noel Grandin Date: Thu Mar 19 14:34:57 2015 +0200 convert opaque numeric value to underlying symbolic constants Change-Id: Id2f74c5104873e78b188c9a2b8c779c8ada3bacc diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx index 3d3e0da..e89745e 100644 --- a/sc/qa/unit/helper/qahelper.hxx +++ b/sc/qa/unit/helper/qahelper.hxx @@ -40,15 +40,15 @@ #define SCQAHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif -#define ODS_FORMAT_TYPE static_cast(50331943) -#define XLS_FORMAT_TYPE static_cast(318767171) -#define XLSX_FORMAT_TYPE static_cast(268959811) -#define LOTUS123_FORMAT_TYPE static_cast(268435649) +#define ODS_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::TEMPLATE | SfxFilterFlags::OWN | SfxFilterFlags::DEFAULT | SfxFilterFlags::ENCRYPTION | SfxFilterFlags::PASSWORDTOMODIFY) +#define XLS_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN | SfxFilterFlags::ENCRYPTION | SfxFilterFlags::PASSWORDTOMODIFY | SfxFilterFlags::PREFERED) +#define XLSX_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN | SfxFilterFlags::STARONEFILTER | SfxFilterFlags::PREFERED) +#define LOTUS123_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::ALIEN | SfxFilterFlags::USESOPTIONS | SfxFilterFlags::PREFERED) #define CSV_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN | SfxFilterFlags::USESOPTIONS) #define HTML_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN | SfxFilterFlags::USESOPTIONS) #define DIF_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN | SfxFilterFlags::USESOPTIONS) #define XLS_XML_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN) -#define XLSB_XML_FORMAT_TYPE static_cast(268959809) +#define XLSB_XML_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::ALIEN | SfxFilterFlags::STARONEFILTER | SfxFilterFlags::PREFERED) #define ODS 0 #define XLS 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/style/undlihdl.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 61a3ace9f42a37640b1ec18fad776ba7c1f61714
Author: Julien Nabet
Date: Sun Mar 8 21:32:39 2015 +0100
Related tdf#50133: Wrong underlining in Reports
By running some tests, I noticed double wave didn't appear when opening
report in non edit mode.
First you must know that to indicate "double wave", xml contains these 2
information:
style:text-underline-style="wave" style:text-underline-type="double"
The problem is the reading order of the parser doesn't seem the same each
time.
So if it reads style then type, it's ok thanks to this part:
132 case awt::FontUnderline::DOUBLE:
133 // A double line style has priority over a bold
line style,
134 // but not over the line style itself.
135 switch( eUnderline )
136 {
137 case awt::FontUnderline::SINGLE:
138 case awt::FontUnderline::BOLD:
139 break;
140 case awt::FontUnderline::WAVE:
141 case awt::FontUnderline::BOLDWAVE:
142 eNewUnderline = awt::FontUnderline::DOUBLEWAVE;
143 break;
but if the parser read type in the first place then style, the case
FontUnderline "DOUBLEWAVE" wasn't managed
Change-Id: Ie090507898e537827eebaae157dfac248baa43f1
Reviewed-on: https://gerrit.libreoffice.org/14801
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/xmloff/source/style/undlihdl.cxx b/xmloff/source/style/undlihdl.cxx
index 268d042..2832d11 100644
--- a/xmloff/source/style/undlihdl.cxx
+++ b/xmloff/source/style/undlihdl.cxx
@@ -233,7 +233,9 @@ bool XMLUnderlineStylePropHdl::importXML( const OUString&
rStrImpValue, uno::Any
eNewUnderline = awt::FontUnderline::BOLDDASHDOTDOT;
break;
case awt::FontUnderline::WAVE:
-if( awt::FontUnderline::BOLD == eUnderline )
+if( awt::FontUnderline::DOUBLE == eUnderline )
+eNewUnderline = awt::FontUnderline::DOUBLEWAVE;
+else if( awt::FontUnderline::BOLD == eUnderline )
eNewUnderline = awt::FontUnderline::BOLDWAVE;
break;
case awt::FontUnderline::SMALLWAVE:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/vclref' - vcl/source
vcl/source/window/window.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 1f0745af1be1edd771b2582b40127a8f150ff82d Author: Michael Meeks Date: Thu Mar 19 13:12:53 2015 + remove erroneous new disposeAndClear. Change-Id: Ib593f05447a8a657649ef83febb4ef0e5b6476dd diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 48414cb..d1d2acb 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -497,7 +497,6 @@ void Window::dispose() // release SalGraphics OutputDevice *pOutDev = GetOutDev(); pOutDev->ReleaseGraphics(); -mpOutputDevice.disposeAndClear(); // notify ImplDelData subscribers of this window about the window deletion ImplDelData* pDelData = mpWindowImpl->mpFirstDel; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sd/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu | 13 +++-- sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml | 24 +- sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml | 18 +++ sd/uiconfig/sdraw/toolbar/standardbar.xml| 22 +++-- sd/uiconfig/sdraw/toolbar/toolbar.xml| 18 --- 5 files changed, 57 insertions(+), 38 deletions(-) New commits: commit c5e012fc65403e960d7f7ab5a3da50f6a2d1c53a Author: Yousuf Philips Date: Thu Mar 19 16:08:48 2015 +0400 tdf#90090 - rearrange Draw's UI by moving around its toolbars Change-Id: I5f76e976ea457cceaaf22c8e2328c944a87d03b5 Reviewed-on: https://gerrit.libreoffice.org/14904 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu index 39d82c9..3b43ac2 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu @@ -45,7 +45,7 @@ - 0,1 + 1,0 true @@ -122,7 +122,7 @@ - 0,1 + 1,0 true @@ -145,11 +145,14 @@ true - 1 + 2 true + + true + Drawing @@ -497,13 +500,13 @@ - 0,1 + 1,0 true - true + false Text Formatting diff --git a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml index ea0b79c..1d6b675 100644 --- a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml +++ b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml @@ -20,26 +20,26 @@ http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink";> - - + + - + - + - + - - + + - + - - - - + + + + diff --git a/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml b/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml index 90abc87..3af5bc9 100644 --- a/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml +++ b/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml @@ -20,21 +20,21 @@ http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink"; toolbar:id="toolbar"> - + - + - + - - - + + + - + - - + + diff --git a/sd/uiconfig/sdraw/toolbar/standardbar.xml b/sd/uiconfig/sdraw/toolbar/standardbar.xml index 601c7f9..ef32191 100644 --- a/sd/uiconfig/sdraw/toolbar/standardbar.xml +++ b/sd/uiconfig/sdraw/toolbar/standardbar.xml @@ -43,18 +43,30 @@ - + - - - - + + + + + + + + + + + + + + + + diff --git a/sd/uiconfig/sdraw/toolbar/toolbar.xml b/sd/uiconfig/sdraw/toolbar/toolbar.xml index 8340dcc..4f2207e 100644 --- a/sd/uiconfig/sdraw/toolbar/toolbar.xml +++ b/sd/uiconfig/sdraw/toolbar/toolbar.xml @@ -19,18 +19,24 @@ --> http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink"; toolbar:id="toolbar"> + + + + - + - - - - + + + + + + @@ -45,8 +51,6 @@ - - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/vclref' - 2 commits - canvas/source vcl/source
canvas/source/vcl/backbuffer.cxx | 10 --
canvas/source/vcl/backbuffer.hxx |3 ++-
canvas/source/vcl/spritecanvashelper.cxx |6 ++
canvas/source/vcl/spritecanvashelper.hxx |4 +++-
vcl/source/outdev/outdevstate.cxx|1 +
vcl/source/outdev/text.cxx |8
6 files changed, 24 insertions(+), 8 deletions(-)
New commits:
commit e821e10c7c605845968604831eb0ffbc30c5682c
Author: Michael Meeks
Date: Thu Mar 19 13:14:32 2015 +
remove un-necessary type punning.
Change-Id: I4f05929daa8b78b309d8a0498a2bb3246af9e18a
diff --git a/vcl/source/outdev/outdevstate.cxx
b/vcl/source/outdev/outdevstate.cxx
index a71c7d6..bc6bd4a 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -641,6 +641,7 @@ void OutputDevice::InitFillColor()
void OutputDevice::ImplReleaseFonts()
{
mpGraphics->ReleaseFonts();
+
mbNewFont = true;
mbInitFont = true;
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 7a2973c..1409a5a 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -2706,8 +2706,8 @@ bool OutputDevice::GetTextOutlines(
::basegfx::B2DPolyPolygonVector& rVector,
if (pSalLayout == 0)
return false;
long nWidth = pSalLayout->GetTextWidth();
-long nHeight = ((OutputDevice*)&aVDev)->mpFontEntry->mnLineHeight +
((OutputDevice*)&aVDev)->mnEmphasisAscent
-+ ((OutputDevice*)&aVDev)->mnEmphasisDescent;
+long nHeight = aVDev->mpFontEntry->mnLineHeight + aVDev->mnEmphasisAscent +
+ aVDev->mnEmphasisDescent;
pSalLayout->Release();
if( !nWidth || !nHeight )
@@ -2756,8 +2756,8 @@ bool OutputDevice::GetTextOutlines(
::basegfx::B2DPolyPolygonVector& rVector,
// draw glyph into virtual device
aVDev->Erase();
pSalLayout->DrawBase() += aOffset;
-pSalLayout->DrawBase() += Point(
((OutputDevice*)&aVDev)->mnTextOffX, ((OutputDevice*)&aVDev)->mnTextOffY );
-pSalLayout->DrawText( *((OutputDevice*)&aVDev)->mpGraphics );
+pSalLayout->DrawBase() += Point( aVDev->mnTextOffX,
aVDev->mnTextOffY );
+pSalLayout->DrawText( *aVDev->mpGraphics );
pSalLayout->Release();
// convert character image into outline
commit bc7ea2108ec1cdde1b02d7cd972d7127658d5a24
Author: Michael Meeks
Date: Thu Mar 19 13:13:47 2015 +
Unwind VCLObject bits for OutputDevice derivatives.
Change-Id: I1abdf0a6d43029fb29e5cbc6c3f788aa98f55a1f
diff --git a/canvas/source/vcl/backbuffer.cxx b/canvas/source/vcl/backbuffer.cxx
index 73d6320..216b5eb 100644
--- a/canvas/source/vcl/backbuffer.cxx
+++ b/canvas/source/vcl/backbuffer.cxx
@@ -43,14 +43,20 @@ namespace vclcanvas
}
}
+BackBuffer::~BackBuffer()
+{
+SolarMutexGuard aGuard;
+maVDev.disposeAndClear();
+}
+
OutputDevice& BackBuffer::getOutDev()
{
-return maVDev.get();
+return *maVDev.get();
}
const OutputDevice& BackBuffer::getOutDev() const
{
-return maVDev.get();
+return *maVDev.get();
}
void BackBuffer::setSize( const ::Size& rNewSize )
diff --git a/canvas/source/vcl/backbuffer.hxx b/canvas/source/vcl/backbuffer.hxx
index 0fea559..479f4dd 100644
--- a/canvas/source/vcl/backbuffer.hxx
+++ b/canvas/source/vcl/backbuffer.hxx
@@ -43,6 +43,7 @@ namespace vclcanvas
*/
BackBuffer( const OutputDevice& rRefDevice,
boolbMonochromeBuffer=false );
+~BackBuffer();
virtual OutputDevice& getOutDev() SAL_OVERRIDE;
virtual const OutputDevice& getOutDev() const SAL_OVERRIDE;
@@ -50,7 +51,7 @@ namespace vclcanvas
void setSize( const ::Size& rNewSize );
private:
-::canvas::vcltools::VCLObjectmaVDev;
+VclPtr< VirtualDevice > maVDev;
};
typedef ::boost::shared_ptr< BackBuffer > BackBufferSharedPtr;
diff --git a/canvas/source/vcl/spritecanvashelper.cxx
b/canvas/source/vcl/spritecanvashelper.cxx
index 037bc48..9164d86 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -189,6 +189,12 @@ namespace vclcanvas
#endif
}
+SpriteCanvasHelper::~SpriteCanvasHelper()
+{
+SolarMutexGuard aGuard;
+maVDev.disposeAndClear();
+}
+
void SpriteCanvasHelper::init( const OutDevProviderSharedPtr& rOutDev,
SpriteCanvas&
rOwningSpriteCanvas,
::canvas::SpriteRedrawManager& rManager,
diff --git a/canvas/source/vcl/spritecanvashelper.hxx
b/canvas/source/vcl/spritecanvashelper.hxx
index dc165d4..0396217 100644
--- a/canvas/source/vcl/spritecanvashelper.hxx
+++ b/canvas/source/vcl/spritecanvashelper.hxx
@@ -23,6 +23,7 @@
#include
#include
+#include
#include
#
[Libreoffice-commits] core.git: canvas/source include/vcl vcl/generic vcl/headless vcl/inc vcl/quartz vcl/source vcl/unx vcl/win
canvas/source/cairo/cairo_cairo.hxx|5 +++--
canvas/source/cairo/cairo_devicehelper.cxx | 15 +++
canvas/source/cairo/cairo_quartz_cairo.cxx | 15 ---
canvas/source/cairo/cairo_quartz_cairo.hxx |2 --
canvas/source/cairo/cairo_win32_cairo.cxx | 14 --
canvas/source/cairo/cairo_win32_cairo.hxx |2 --
canvas/source/cairo/cairo_xlib_cairo.cxx |5 +++--
canvas/source/cairo/cairo_xlib_cairo.hxx |2 +-
include/vcl/outdev.hxx |1 -
vcl/generic/print/genpspgraphics.cxx |5 -
vcl/headless/svpgdi.cxx|5 -
vcl/inc/generic/genpspgraphics.h |1 -
vcl/inc/headless/svpgdi.hxx|1 -
vcl/inc/quartz/salgdi.h|1 -
vcl/inc/salgdi.hxx |1 -
vcl/inc/unx/salgdi.h |1 -
vcl/inc/win/salgdi.h |1 -
vcl/quartz/salgdicommon.cxx|5 -
vcl/source/outdev/outdev.cxx | 11 ---
vcl/unx/generic/gdi/salgdi.cxx |5 -
vcl/win/source/gdi/salgdi.cxx |5 -
21 files changed, 14 insertions(+), 89 deletions(-)
New commits:
commit 6c806749421caf9267325cd86372c488f585ab5a
Author: Caolán McNamara
Date: Thu Mar 19 10:13:57 2015 +
reorganize resizing surfaces logic
the only case where we don't just create a new surface is the X11 case
Change-Id: I98a3c8f227e208ac9db969ed7711e293fb237c2e
Reviewed-on: https://gerrit.libreoffice.org/14902
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/canvas/source/cairo/cairo_cairo.hxx
b/canvas/source/cairo/cairo_cairo.hxx
index ab73a56..e256610 100644
--- a/canvas/source/cairo/cairo_cairo.hxx
+++ b/canvas/source/cairo/cairo_cairo.hxx
@@ -63,8 +63,9 @@ namespace cairo {
/// factory for VirDev on this surface
virtual boost::shared_ptr createVirtualDevice() const =
0;
-/// Resize the surface (possibly destroying content)
-virtual void Resize( int width, int height ) = 0;
+/// Resize the surface (possibly destroying content), only possible
for X11 typically
+/// so on failure create a new surface instead
+virtual bool Resize( int /*width*/, int /*height*/ ) { return false; }
/// Flush all pending output to surface
virtual void flush() const = 0;
diff --git a/canvas/source/cairo/cairo_devicehelper.cxx
b/canvas/source/cairo/cairo_devicehelper.cxx
index 920481e..c5296b7 100644
--- a/canvas/source/cairo/cairo_devicehelper.cxx
+++ b/canvas/source/cairo/cairo_devicehelper.cxx
@@ -90,15 +90,14 @@ namespace cairocanvas
if( !mpRefDevice )
return; // disposed
-OutputDevice* pOutDev=getOutputDevice();
+OutputDevice* pOutDev = getOutputDevice();
-if (mpSurface && pOutDev->CanResizeCairoSurface())
-{
-// X11 only
-mpSurface->Resize( rSize.getX() + pOutDev->GetOutOffXPixel(),
- rSize.getY() + pOutDev->GetOutOffYPixel() );
-}
-else
+// X11 only
+bool bReuseSurface = mpSurface &&
+ mpSurface->Resize(rSize.getX() +
pOutDev->GetOutOffXPixel(),
+ rSize.getY() +
pOutDev->GetOutOffYPixel());
+
+if (!bReuseSurface)
{
mpSurface = cairo::createSurface(
*pOutDev,
diff --git a/canvas/source/cairo/cairo_quartz_cairo.cxx
b/canvas/source/cairo/cairo_quartz_cairo.cxx
index f4456aa..8da24f3 100644
--- a/canvas/source/cairo/cairo_quartz_cairo.cxx
+++ b/canvas/source/cairo/cairo_quartz_cairo.cxx
@@ -163,21 +163,6 @@ namespace cairo
}
/**
- * QuartzSurface::Resize: Resizes the Canvas surface.
- * @param width new width of the surface
- * @param height new height of the surface
- *
- * Only used on X11.
- *
- * @return The new surface or NULL
- **/
-void QuartzSurface::Resize( int /* width */, int /* height */ )
-{
-OSL_FAIL("not supposed to be called!");
-}
-
-
-/**
* QuartzSurface::flush: Draw the data to screen
**/
void QuartzSurface::flush() const
diff --git a/canvas/source/cairo/cairo_quartz_cairo.hxx
b/canvas/source/cairo/cairo_quartz_cairo.hxx
index cbcbf27..a3f94d2 100644
--- a/canvas/source/cairo/cairo_quartz_cairo.hxx
+++ b/canvas/source/cairo/cairo_quartz_cairo.hxx
@@ -57,8 +57,6 @@ namespace cairo {
virtual boost::shared_ptr createVirtualDevice() const;
-virtual void Resize( int width, int height );
-
virtual void flush() const;
int getDepth() const;
diff --git a/canvas/source/cairo/cairo_win32_cairo.cxx
b/canvas/source/cairo/cairo_win32_cairo.cxx
index 20efd33..a54c7e1 100644
--- a/canvas/source/cairo/cairo_win32_cairo.cxx
+++ b/canvas/source/c
4.4.3.0.0+ build fails (unit tests)
Hi, it seems that the following commit breaks the build of LibreOffice 4.4.3.0.0+ : https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=92a43d05d14b1ab7b8bfb4052874d0f0e6c62ef9 I get the following error message in unit tests: File tested,Execution Time (ms) fdo68963.doc,unknown:0:testfdo68963::Import An uncaught exception of type com.sun.star.lang.IllegalArgumentException - Unsupported URL : "type detection failed" [...] ##Failure Location unknown## : Error Test name: testfdo68963::Import An uncaught exception of type com.sun.star.lang.IllegalArgumentException - Unsupported URL : "type detection failed" Best regards. JBF ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 4.4.3.0.0+ build fails (unit tests)
I thought that fdo68963.doc only existed in the 4.5 tree. That file did not need to be deleted. P.S. I have not been able to figure out how to remove a file from a commit if I add it accidentally. If I do a "git commit -a" and get an unintended file, how do I amend the commit to "ignore" the file? (That is what happened here.) Thanks, Justin On 19/03/15 16:25, jbfa...@libreoffice.org wrote: > Hi, > it seems that the following commit breaks the build of LibreOffice > 4.4.3.0.0+ : > > https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=92a43d05d14b1ab7b8bfb4052874d0f0e6c62ef9 > > > I get the following error message in unit tests: > > File tested,Execution Time (ms) > fdo68963.doc,unknown:0:testfdo68963::Import > An uncaught exception of type com.sun.star.lang.IllegalArgumentException > - Unsupported URL > : "type > detection failed" > [...] > ##Failure Location unknown## : Error > Test name: testfdo68963::Import > An uncaught exception of type com.sun.star.lang.IllegalArgumentException > - Unsupported URL > : "type > detection failed" > > Best regards. > JBF > > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - svx/source
svx/source/svdraw/svdmrkv.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 97abf479e785d1a6098f972f5215271960d0f79f
Author: Miklos Vajna
Date: Thu Mar 19 14:26:36 2015 +0100
SdrMarkView tiled rendering: suppress handles during text edit
Without this, graphic selection was still around during text editing, so
long push on an editeng word (in a Writer shape) triggered the shape
movement action, not a word selection in editeng.
Change-Id: I2ec2f1f9a417bacd08d8b357b4203d48ebaf15c7
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index cc8badb..ac5d4ff 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -686,6 +686,9 @@ void SdrMarkView::SetMarkHandles()
if(pSdrTextObj && pSdrTextObj->IsInEditMode())
{
+if (GetModel()->isTiledRendering())
+// Suppress handles -> empty graphic selection.
+
GetModel()->libreOfficeKitCallback(LOK_CALLBACK_GRAPHIC_SELECTION, "EMPTY");
return;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/vclref' - 2 commits - vcl/inc vcl/qa vcl/source
vcl/inc/svdata.hxx|2 ++
vcl/qa/cppunit/outdev.cxx | 26 +-
vcl/source/app/svdata.cxx |8
3 files changed, 23 insertions(+), 13 deletions(-)
New commits:
commit 3af9a3aba0d2148e1e0ad93c16e198af05730edc
Author: Michael Meeks
Date: Thu Mar 19 13:56:13 2015 +
ImplSVGDIData didn't dispose its contents previously; clobber it for now.
Change-Id: I71c83cbdabe10f617d1d3d7141ebd6d93923
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index a8bbd58..cdba5cd 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -152,6 +152,8 @@ struct ImplSVAppData
struct ImplSVGDIData
{
+~ImplSVGDIData();
+
VclPtrmpFirstWinGraphics; // First
OutputDevice with a Frame Graphics
VclPtrmpLastWinGraphics; // Last
OutputDevice with a Frame Graphics
VclPtrmpFirstVirGraphics; // First
OutputDevice with a VirtualDevice Graphics
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 4459fad..213f13d 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -88,6 +88,14 @@ ImplSVData::ImplSVData()
maNWFData.maMenuBarHighlightTextColor = Color( COL_TRANSPARENT );
}
+ImplSVGDIData::~ImplSVGDIData()
+{
+// FIXME: deliberately leak any remaining OutputDevice
+// until we have their pGraphics reference counted, doing
+// any disposes so late in shutdown is rather unsafe.
+memset( this, 0, sizeof( ImplSVGDIData ) );
+}
+
void ImplDeInitSVData()
{
ImplSVData* pSVData = ImplGetSVData();
commit 01cd8cbebeba7221123ad01b29bc7b3d3a378c59
Author: Michael Meeks
Date: Thu Mar 19 13:56:03 2015 +
fix VirtualDevice unit test.
Change-Id: I7a1f95ae1d8577114634c62aa89d3c7e1fde62c1
diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx
index 63d88b8..8377a19 100644
--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@@ -32,17 +32,17 @@ public:
void VclOutdevTest::testVirtualDevice()
{
-VirtualDevice aVDev;
-aVDev.SetOutputSizePixel(Size(32,32));
-aVDev.SetBackground(Wallpaper(COL_WHITE));
-aVDev.Erase();
-aVDev.DrawPixel(Point(1,2),COL_BLUE);
-aVDev.DrawPixel(Point(31,30),COL_RED);
-
-Size aSize = aVDev.GetOutputSizePixel();
+ScopedVclPtr pVDev( new VirtualDevice() );
+pVDev->SetOutputSizePixel(Size(32,32));
+pVDev->SetBackground(Wallpaper(COL_WHITE));
+pVDev->Erase();
+pVDev->DrawPixel(Point(1,2),COL_BLUE);
+pVDev->DrawPixel(Point(31,30),COL_RED);
+
+Size aSize = pVDev->GetOutputSizePixel();
CPPUNIT_ASSERT(aSize == Size(32,32));
-Bitmap aBmp = aVDev.GetBitmap(Point(),aSize);
+Bitmap aBmp = pVDev->GetBitmap(Point(),aSize);
#if 0
OUString rFileName("/tmp/foo-unx.png");
@@ -56,12 +56,12 @@ void VclOutdevTest::testVirtualDevice()
}
#endif
-CPPUNIT_ASSERT_EQUAL(COL_WHITE, aVDev.GetPixel(Point(0,0)).GetColor());
+CPPUNIT_ASSERT_EQUAL(COL_WHITE, pVDev->GetPixel(Point(0,0)).GetColor());
#if defined LINUX //TODO: various failures on Mac and Windows tinderboxes
-CPPUNIT_ASSERT_EQUAL(COL_BLUE, aVDev.GetPixel(Point(1,2)).GetColor());
-CPPUNIT_ASSERT_EQUAL(COL_RED, aVDev.GetPixel(Point(31,30)).GetColor());
+CPPUNIT_ASSERT_EQUAL(COL_BLUE, pVDev->GetPixel(Point(1,2)).GetColor());
+CPPUNIT_ASSERT_EQUAL(COL_RED, pVDev->GetPixel(Point(31,30)).GetColor());
#endif
-CPPUNIT_ASSERT_EQUAL(COL_WHITE, aVDev.GetPixel(Point(30,31)).GetColor());
+CPPUNIT_ASSERT_EQUAL(COL_WHITE, pVDev->GetPixel(Point(30,31)).GetColor());
// Gotcha: y and x swap for BitmapReadAccess: deep joy.
Bitmap::ScopedReadAccess pAcc(aBmp);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: 4.4.3.0.0+ build fails (unit tests)
Hi Justin, On Thu, Mar 19, 2015 at 04:32:35PM +0300, Justin Luth wrote: > P.S. I have not been able to figure out how to remove a file from a > commit if I add it accidentally. If I do a "git commit -a" and get an > unintended file, how do I amend the commit to "ignore" the file? (That > is what happened here.) rm , then git commit -a --amend Regards, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/vclref' - canvas/source include/svx svx/source sw/inc sw/qa sw/source vcl/workben
canvas/source/vcl/spritecanvashelper.cxx |4 +-
canvas/source/vcl/spritecanvashelper.hxx |2 -
include/svx/sdrpaintwindow.hxx|6 +--
include/svx/svdobj.hxx|3 +
include/svx/svdpntv.hxx |4 +-
svx/source/svdraw/sdrpaintwindow.cxx | 26 +---
svx/source/svdraw/svdedxv.cxx |8 ++---
svx/source/svdraw/svdpntv.cxx |8 ++---
svx/source/svdraw/svdview.cxx | 14 -
svx/source/unodraw/UnoGraphicExporter.cxx | 46 +++---
svx/source/unodraw/unoshape.cxx |6 +--
svx/source/xoutdev/_xoutbmp.cxx | 38
svx/source/xoutdev/xattrbmp.cxx | 24 +++
svx/source/xoutdev/xtabdash.cxx | 16 +-
svx/source/xoutdev/xtabgrdt.cxx | 10 +++---
svx/source/xoutdev/xtabhtch.cxx | 16 +-
svx/source/xoutdev/xtablend.cxx | 16 +-
sw/inc/viewsh.hxx | 12 +++
sw/qa/tiledrendering/tiledrendering.cxx |6 +--
sw/source/core/frmedt/fecopy.cxx | 18 +--
sw/source/core/layout/paintfrm.cxx| 14 -
sw/source/core/view/vnew.cxx |2 -
sw/source/filter/ww8/wrtww8gr.cxx | 12 +++
vcl/workben/vcldemo.cxx |5 +--
24 files changed, 160 insertions(+), 156 deletions(-)
New commits:
commit 32f1a7dbca9827642653d314bd96560c093a06ea
Author: Michael Meeks
Date: Thu Mar 19 14:38:23 2015 +
Fix OutputDevice members / stack allocation.
Change-Id: Ie57434607b61085a882af40b63d6a4b7aac0d4d3
diff --git a/canvas/source/vcl/spritecanvashelper.cxx
b/canvas/source/vcl/spritecanvashelper.cxx
index 9164d86..51d01f4 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -324,7 +324,7 @@ namespace vclcanvas
mpRedrawManager->forEachSprite(
::boost::bind(
&spriteRedraw,
-::boost::ref( maVDev.get() ),
+::boost::ref( *maVDev.get() ),
_1 ) );
// flush to screen
@@ -582,7 +582,7 @@ namespace vclcanvas
::std::for_each( rSortedUpdateSprites.begin(),
rSortedUpdateSprites.end(),
::boost::bind( &spriteRedrawStub2,
-::boost::ref( maVDev.get() ),
+::boost::ref( *maVDev.get() ),
::vcl::unotools::b2DPointFromPoint(
aOutputPosition),
_1 ) );
diff --git a/canvas/source/vcl/spritecanvashelper.hxx
b/canvas/source/vcl/spritecanvashelper.hxx
index 0396217..a6b3c03 100644
--- a/canvas/source/vcl/spritecanvashelper.hxx
+++ b/canvas/source/vcl/spritecanvashelper.hxx
@@ -41,7 +41,7 @@ namespace vclcanvas
{
public:
SpriteCanvasHelper();
-~SpriteCanvasHelper()
+~SpriteCanvasHelper();
void init( const OutDevProviderSharedPtr& rOutDev,
SpriteCanvas& rOwningSpriteCanvas,
diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx
index 3a1f1ef..d8f0918 100644
--- a/include/svx/sdrpaintwindow.hxx
+++ b/include/svx/sdrpaintwindow.hxx
@@ -50,10 +50,10 @@ PaintTransparentChildren(vcl::Window & rWindow, Rectangle
const& rPixelRect);
class SdrPreRenderDevice
{
// The original OutputDevice
-OutputDevice& mrOutputDevice;
+OutputDevice& mrOutputDevice;
// The VirtualDevice for PreRendering
-VirtualDevice maPreRenderDevice;
+VclPtr mpPreRenderDevice;
public:
explicit SdrPreRenderDevice(OutputDevice& rOriginal);
@@ -63,7 +63,7 @@ public:
void OutputPreRenderDevice(const vcl::Region& rExpandedRegion);
OutputDevice& GetOriginalOutputDevice() const { return mrOutputDevice; }
-OutputDevice& GetPreRenderDevice() { return maPreRenderDevice; }
+OutputDevice& GetPreRenderDevice() { return *mpPreRenderDevice.get(); }
};
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index fd1f56f..4ecf505 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -172,7 +173,7 @@ class SVX_DLLPUBLIC SdrObjMacroHitRec
public:
Point aPos;
Point aDownPos;
-OutputDevice* pOut;
+VclPtrpOut;
const SetOfByte*pVisiLayer;
const SdrPageView* pPageView;
sal_uInt16 nTol;
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 110bb84..347de0b 100644
--- a/i
[Libreoffice-commits] core.git: Branch 'feature/vclref' - canvas/source chart2/source cui/source
canvas/source/cairo/cairo_textlayout.cxx | 10 +--
canvas/source/opengl/ogl_canvashelper.cxx | 12 +--
canvas/source/vcl/canvasfont.cxx |6 -
canvas/source/vcl/canvashelper_texturefill.cxx| 14 ++--
canvas/source/vcl/textlayout.cxx | 26
chart2/source/controller/drawinglayer/ViewElementListProvider.cxx |6 -
chart2/source/view/main/3DChartObjects.cxx| 16 ++---
chart2/source/view/main/DummyXShape.cxx | 16 ++---
chart2/source/view/main/OpenGLRender.cxx | 16 ++---
cui/source/customize/cfg.cxx | 32
+-
cui/source/tabpages/tpline.cxx|6 -
11 files changed, 80 insertions(+), 80 deletions(-)
New commits:
commit 0998ad0fec9150a491b4ccdcf7490715bcdc2eeb
Author: Michael Meeks
Date: Thu Mar 19 14:45:20 2015 +
Fix OutputDevice members / stack allocation: chart, canvas, cui.
Change-Id: Ieb6f58222ffc3e03c1d599752a6f02600e1bee1f
diff --git a/canvas/source/cairo/cairo_textlayout.cxx
b/canvas/source/cairo/cairo_textlayout.cxx
index 892830e..bde8c48 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -180,14 +180,14 @@ namespace cairocanvas
if( !pOutDev )
return geometry::RealRectangle2D();
-VirtualDevice aVDev( *pOutDev );
-aVDev.SetFont( mpFont->getVCLFont() );
+ScopedVclPtr pVDev( new VirtualDevice( *pOutDev ) );
+pVDev->SetFont( mpFont->getVCLFont() );
// need metrics for Y offset, the XCanvas always renders
// relative to baseline
-const ::FontMetric& aMetric( aVDev.GetFontMetric() );
+const ::FontMetric& aMetric( pVDev->GetFontMetric() );
-setupLayoutMode( aVDev, mnTextDirection );
+setupLayoutMode( *pVDev.get(), mnTextDirection );
const sal_Int32 nAboveBaseline( -aMetric.GetIntLeading() -
aMetric.GetAscent() );
const sal_Int32 nBelowBaseline( aMetric.GetDescent() );
@@ -201,7 +201,7 @@ namespace cairocanvas
else
{
return geometry::RealRectangle2D( 0, nAboveBaseline,
- aVDev.GetTextWidth(
+ pVDev->GetTextWidth(
maText.Text,
::canvas::tools::numeric_cast(maText.StartPosition),
::canvas::tools::numeric_cast(maText.Length) ),
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx
b/canvas/source/opengl/ogl_canvashelper.cxx
index 8c4969b..d3a897d 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -725,8 +725,8 @@ namespace oglcanvas
if( mpDevice )
{
-VirtualDevice aVDev;
-aVDev.EnableOutput(false);
+ScopedVclPtr pVDev(new VirtualDevice());
+pVDev->EnableOutput(false);
CanvasFont*
pFont=dynamic_cast(xLayoutetText->getFont().get());
const rendering::StringContext& rTxt=xLayoutetText->getText();
@@ -749,7 +749,7 @@ namespace oglcanvas
// adjust to stretched font
if(!::rtl::math::approxEqual(rFontMatrix.m00, rFontMatrix.m11))
{
-const Size aSize = aVDev.GetFontMetric( aFont ).GetSize();
+const Size aSize = pVDev->GetFontMetric( aFont ).GetSize();
const double fDividend( rFontMatrix.m10 + rFontMatrix.m11
);
double fStretch = (rFontMatrix.m00 + rFontMatrix.m01);
@@ -762,7 +762,7 @@ namespace oglcanvas
}
// set font
-aVDev.SetFont(aFont);
+pVDev->SetFont(aFont);
mpRecordedActions->push_back( Action() );
Action& rAct=mpRecordedActions->back();
@@ -780,7 +780,7 @@ namespace oglcanvas
pDXArray[i] = basegfx::fround( aLogicalAdvancements[i]
);
// get the glyphs
-aVDev.GetTextOutlines(rAct.maPolyPolys,
+pVDev->GetTextOutlines(rAct.maPolyPolys,
rTxt.Text,
0,
rTxt.StartPosition,
@@ -792,7 +792,7 @@ namespace oglcanvas
else
{
// get the glyphs
-aVDev.GetTextOutlines(rAct.maPolyPolys,
+pVDev->GetTextOutlines(rAct.maPolyPolys,
rTxt.Text,
0,
[Libreoffice-commits] core.git: Branch 'feature/vclref' - cui/source desktop/source lotuswordpro/source sfx2/source
cui/source/tabpages/tpline.cxx |6 +++---
desktop/source/lib/init.cxx |8
desktop/source/splash/splash.cxx | 26 +-
lotuswordpro/source/filter/lwppagelayout.cxx |8
sfx2/source/dialog/backingwindow.cxx | 10 +-
sfx2/source/doc/objcont.cxx | 12 ++--
6 files changed, 35 insertions(+), 35 deletions(-)
New commits:
commit 14c931f8354f5ca6e127fa49b06264002ede1491
Author: Michael Meeks
Date: Thu Mar 19 14:58:31 2015 +
Fix OutputDevice members / stack allocation: desktop, sfx2, lwp.
Change-Id: I5563cfa35142f088533ae998d087dec669a13287
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 9fbaa2e..f64eddb 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -360,8 +360,8 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
if(!pButton->GetPopupMenu()->GetPopupMenu( MN_SYMBOLS ) && pSymbolList)
{
-VirtualDevice aVDev;
-aVDev.SetMapMode(MapMode(MAP_100TH_MM));
+ScopedVclPtr pVDev( new VirtualDevice() );
+pVDev->SetMapMode(MapMode(MAP_100TH_MM));
boost::scoped_ptr pModel(new SdrModel);
pModel->GetItemPool().FreezeIdRanges();
// Page
@@ -370,7 +370,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
pModel->InsertPage( pPage, 0 );
{
// 3D View
-boost::scoped_ptr pView(new SdrView( pModel.get(), &aVDev ));
+boost::scoped_ptr pView(new SdrView( pModel.get(), pVDev ));
pView->hideMarkHandles();
pView->ShowSdrPage(pPage);
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b3593d0..9d1ae9d 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -566,16 +566,16 @@ void doc_paintTile (LibreOfficeKitDocument* pThis,
SvpSalInstance* pSalInstance = static_cast< SvpSalInstance*
>(pSVData->mpDefInst);
pSalInstance->setBitCountFormatMapping( 32,
::basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA );
-VirtualDevice aDevice(0, Size(1, 1), (sal_uInt16)32);
+ScopedVclPtr pDevice( new VirtualDevice(0, Size(1, 1),
(sal_uInt16)32)) ;
boost::shared_array< sal_uInt8 > aBuffer( pBuffer, NoDelete< sal_uInt8 >()
);
-aDevice.SetOutputSizePixelScaleOffsetAndBuffer(
+pDevice->SetOutputSizePixelScaleOffsetAndBuffer(
Size(nCanvasWidth, nCanvasHeight), Fraction(1.0), Point(),
aBuffer, true );
-pDoc->paintTile(aDevice, nCanvasWidth, nCanvasHeight,
+pDoc->paintTile(*pDevice.get(), nCanvasWidth, nCanvasHeight,
nTilePosX, nTilePosY, nTileWidth, nTileHeight);
-SvpSalVirtualDevice* pSalDev = static_cast< SvpSalVirtualDevice*
>(aDevice.getSalVirtualDevice());
+SvpSalVirtualDevice* pSalDev = static_cast< SvpSalVirtualDevice*
>(pDevice->getSalVirtualDevice());
basebmp::BitmapDeviceSharedPtr pBmpDev = pSalDev->getBitmapDevice();
*pRowStride = pBmpDev->getScanlineStride();
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index e3be3e0..1fdc406 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -149,7 +149,7 @@ SplashScreen::SplashScreen()
, _yoffset(18)
{
loadConfig();
-_vdev.EnableRTL(IsRTLEnabled());
+_vdev->EnableRTL(IsRTLEnabled());
}
SplashScreen::~SplashScreen()
@@ -258,7 +258,7 @@ SplashScreen::initialize( const
::com::sun::star::uno::Sequence< ::com::sun::sta
SetScreenBitmap (_aIntroBmp);
Size aSize = _aIntroBmp.GetSizePixel();
SetOutputSizePixel( aSize );
-_vdev.SetOutputSizePixel( aSize );
+_vdev->SetOutputSizePixel( aSize );
_height = aSize.Height();
_width = aSize.Width();
if (_width > 500)
@@ -615,7 +615,7 @@ void SplashScreen::Paint( const Rectangle&)
//non native drawing
// draw bitmap
if (_bPaintBitmap)
-_vdev.DrawBitmapEx( Point(), _aIntroBmp );
+_vdev->DrawBitmapEx( Point(), _aIntroBmp );
if (_bPaintProgress) {
// draw progress...
@@ -623,20 +623,20 @@ void SplashScreen::Paint( const Rectangle&)
if (length < 0) length = 0;
// border
-_vdev.SetFillColor();
-_vdev.SetLineColor( _cProgressFrameColor );
-_vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+_barwidth, _tly+_barheight));
-_vdev.SetFillColor( _cProgressBarColor );
-_vdev.SetLineColor();
-_vdev.DrawRect(Rectangle(_tlx+_barspace, _tly+_barspace,
_tlx+_barspace+length, _tly+_barheight-_barspace));
+_vdev->SetFillColor();
+_vdev->SetLineColor( _cProgressFrameColor );
+_vdev->DrawRect(Rectangle(_tlx, _tly, _tlx+_barwidth,
_tly+_barheight));
+_vdev->SetFillColor( _cProgressBarColor );
+_vdev->SetLineColor();
+_vdev->DrawRect(Rectangle(_tlx+_b
minutes of ESC call ...
* Present: + Muthu, Sophie, Andras, Miklos, Caolan, David, Michael M, Robinson, Norbert, Jan-Marek, Kendy, Lionel * Completed Action Items: * Pending Action Items: + please file an Easy-Hack this week: just a bug with whiteboard: (All) "EasyHack DifficultyBeginner SkillCpp TopicCleanup" + thanks to: + http://bit.ly/1KR4HWX + make sure to create a new openid if you are using the Google openID (all) [ still need to get this done ! ] + poke Mathiew wrt. Windows / locking bug & revert if no response (Michael S) https://bugs.documentfoundation.org/show_bug.cgi?id=72337 * GSoC (?) + student application period: March 16 to March 27th + Wiki page for tasks: https://wiki.documentfoundation.org/Development/Gsoc/Ideas * Release Engineering update (Robinson) + Cloph on vacation. + 4.4.2 RC2 after the hack-fest + 4.3.7 RC1 April 7th or so + 4.5.0 / 5.0.0? - 1st Alpha release - April 13th + Android & iOS Remote * Crashtest update (Caolan) + couple of hundred crashers; all the same problem in the new service naming scheme, next report should be small again. + more service bits in gerrit (Miklos) * Hackfests (Bjoern) + Las Palmas de Gran Canaria, Spain + March 19th, 20th: Thur / Fri. https://wiki.documentfoundation.org/Hackfest/GranCanaria2015 + Cambridge, UK - May 2015 - contact (Michael) + 21st -> 23rd May confirmed. Thur / Fri / Sat. + Cambridge Beer Festival overlap / Punting Excursion planned etc. https://wiki.documentfoundation.org/Hackfest/Cambridge2015 * UX Update (Kendy) + not so much this week; finalized & blogged about CMIS updated workflow + not huge changes; a new toolbar button in toolbar & start-center + replace the internal file dialog with an on-line CMIS browser + makes no sense not to use the system dialog handler. + breeze icons now in the repository & compressed by Andrew * l10n Update (Sophie) + still working on the pootle upgrade * Developer Certification (Stephan/Bjoern/Kendy) + still pending script foo. * Jenkins update (Norbert) + jenkins: http://ci.libreoffice.org/view/Dashboard/ + Windows system is more resilient + this morning a job got stuck & timed out / killed after a while. + can build a feature branch if we want to + need to push a patch through gerrit; at the end - put one of the last patches + git push origin HEAD:refs/for/feature/branch + and bingo. + lcov: http://lcov.libreoffice.org/ + failing around coinmp - Makefile doesn't like it. + still pending. * Tinderbox functionality stats (Norbert) + what %age of time is green for each platform ? + Linux: 90% green + Mac: 75% green + Windows: 66% green + is it related to build-times ? (Michael) + Linux & Mac - are incremental + mostly tied to people fixing on that platform (Kendy) + waits for Windows users to fix things. + Linux started a lot later as a TB (Norbert) * VclPtr (Michael) + Noel and I working hard on it + tentacles of lifecycle badness everywhere * Document Liberation (David) + some good candidates for GSOC + lots of followers on twitter. * QA (Robinson) + UNCONFIRMED at 319 + needAdvice at 11 + running out of 4.4 regressions to bisect (Matthew Francis) + goal is to be able to build bibisect in real-time + compressing the pack takes over a day (Norbert) + would like to do it all on one machine (Robinson) + vmiklos' dbgutil / master bibisect repo on dev-builds + useful for chasing master. * QA stats: + https://bugs.documentfoundation.org/page.cgi?id=weekly-bug-summary.html +123-79(+44 overall) many thanks to the top bug squashers: Jean-Baptiste Faure 12 raal 10 Serg Bormant 7 V Stuart Foote 6 Michael Stahl 5 Cor Nouws 3 Beluga 2 Julien Nabet 2 David Tardon 2 Adolfo Jayme 2 Matthew Francis2 Laurent BP 2 Kohei Yoshida 1 Joni_M 1 Markus Mohrhard1 * Open 4.5 MAB + 1/3 1/3 0/2 0/2 1/2 0/1 0/1 0/1 0/1 + https://bugs.documentfoundation.org/showdependencytree.cgi?id=86696&hide_resolved=1 * Open 4.4 MAB + 13/49 15/49 14/48 13/47 12/46 16/44 16/43 16/40 14/38 11/34 6/26 6/24 7/24 26% 30% 29% 27% 26% 36% 37% 40% 36% 32% 23% 25% 29% + https://bugs.documentfoundation.org/showdependencytree.cgi?id=79641&hide_resolved=1 * Open 4.3 MAB + 78/160 79/160 77/158 77/158 76/158 77/156 77/155 78/155 86
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/dbui/dbmgr.cxx |5 - 1 file changed, 5 deletions(-) New commits: commit adb98d94ca1059b56d6b6726ca9aea96ecae8a96 Author: Jan-Marek Glogowski Date: Thu Mar 19 15:48:37 2015 +0100 tdf#70346 MM: don't restore section visibility Mail merging the current document is expected to change the source document. So there is no need to try to restore the pre-MM document, even the visibility. In the end any effort is futile, as field changes cannot be undone. Even worse: it introduced a regression using the "data to fields" function from the data source manager (F4), which would never set the correct section visibility. We need to copy the document to prevent changes to the source document and skip the quite probably unexpected save in MM. Change-Id: I814905f1566a63b2ee14cb5f6d08da34c05942aa diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 1b3e2c5..fa635d7 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -453,11 +453,6 @@ bool SwDBManager::MergeNew( const SwMergeDescriptor& rMergeDesc ) DELETEZ( pImpl->pMergeData ); -// Recalculate original section visibility states, as field changes aren't -// tracked (not undo-able). Has to be done, after pImpl->pMergeData is -// gone, otherwise merge data is used for calculation! -rMergeDesc.rSh.SwViewShell::UpdateFlds(); - bInMerge = false; return bRet; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - android/Bootstrap android/experimental README.cross
README.cross | 27 +++ android/Bootstrap/Makefile.shared|2 +- android/experimental/LOAndroid3/Makefile |5 - 3 files changed, 8 insertions(+), 26 deletions(-) New commits: commit f3d4d3c6e5916b5f6ba88060cd07dbd28660dd9b Author: Miklos Vajna Date: Thu Mar 19 16:16:55 2015 +0100 android: add debugrun Makefile target Also, if we are at it: - clean up 'run' as well: since the doc browser is the default activity, no need to pass the test doc path anymore - make 'install' not depend on build: a full build would need a toplevel 'make' anyway Change-Id: Ia55d52f767ab3e0be02a753a95b2aac02f8491cc diff --git a/README.cross b/README.cross index 109588e..efaa8c2 100644 --- a/README.cross +++ b/README.cross @@ -339,13 +339,8 @@ course need an appropriate system image for that. Here is an autogen.input for Android on ARM when cross-compiling from Linux: ---build=x86_64-unknown-linux-gnu --enable-dbgutil ---enable-debug --enable-werror ---with-android-ndk=/home/tml/android-ndk-r9c ---with-android-ndk-toolchain-version=4.8 ---with-android-sdk=/home/tml/adt-bundle-linux/sdk --with-distro=LibreOfficeAndroid And here is an (quite old) autogen.input for Android on X86: @@ -368,25 +363,9 @@ Note that none of these apps in any way are claimed to be ready for end-users. No "beta testing" offers needed, it is painfully obvious what problems they have. -To run some of the apps, do "make install" followed by either "make -run" or starting it from Android itself. You most likely want to have -an "adb logcat" running in another window. - -To debug, do manually what "make run" would do and when the app has -started, run ndk-gdb. - -You can also do that manually; to install: - - /platform-tools/adb install -r android/experimental/LOAndroid3/bin/LibreOfficeViewer-debug.apk - -To see the log: - - /platform-tools/adb logcat - -To debug, install the .apk, run it, and then: - - cd android/experimental/LOAndroid3 - /ndk-gdb --adb=/platform-tools/adb +To run some of the apps, do "make install" followed by either "make run" or +starting it from Android itself. You most likely want to have an "adb logcat" +running in another window. To debug, run "make debugrun". NB: If you happen to upgrade to Android SDK Tools 23, and the build (using 'make verbose=t android') fails for you with: diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 2a8b545..5020773 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -64,7 +64,7 @@ properties: echo "APP_ABI := $(ANDROID_APP_ABI)" > jni/Application.mk echo "APP_PLATFORM := android-15" >> jni/Application.mk -install: build-ant +install: unset JAVA_HOME && $(ANT) $(if $(VERBOSE)$(verbose),,-quiet) debug install @echo @echo 'Run it with "make run"' diff --git a/android/experimental/LOAndroid3/Makefile b/android/experimental/LOAndroid3/Makefile index ecefd10..fbcec0c 100644 --- a/android/experimental/LOAndroid3/Makefile +++ b/android/experimental/LOAndroid3/Makefile @@ -35,4 +35,7 @@ build-ant: android_version_setup copy-stuff prepare-appcompat link-so properties unset JAVA_HOME && $(ANT) $(if $(VERBOSE)$(verbose),,-quiet) $(if $(ENABLE_RELEASE_BUILD),release,debug) run: - adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity -e input /assets/test1.odt + adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity + +debugrun: + $(SYSBASE)/../../../ndk-gdb --start ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/vclref' - sc/source sd/source slideshow/source starmath/qa
sc/source/core/data/global.cxx | 10 +- sc/source/filter/rtf/eeimpars.cxx |4 sc/source/ui/app/transobj.cxx | 20 ++-- sc/source/ui/docshell/docfunc.cxx |1 sc/source/ui/docshell/docsh.cxx|4 sc/source/ui/docshell/docsh3.cxx | 10 +- sc/source/ui/undo/undobase.cxx |8 - sc/source/ui/undo/undoblk.cxx |4 sc/source/ui/undo/undoblk3.cxx |6 - sc/source/ui/undo/undostyl.cxx |6 - sc/source/ui/unoobj/styleuno.cxx | 24 ++--- sc/source/ui/view/viewfunc.cxx | 12 +- sd/source/filter/html/buttonset.cxx| 12 +- sd/source/ui/annotations/annotationtag.cxx | 20 ++-- sd/source/ui/dlg/animobjs.cxx | 18 ++-- sd/source/ui/dlg/docprev.cxx | 18 ++-- sd/source/ui/docshell/docshel2.cxx | 20 ++-- sd/source/ui/slideshow/showwin.cxx | 16 +-- sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx | 16 +-- slideshow/source/engine/rehearsetimingsactivity.cxx| 40 - slideshow/source/engine/shapes/gdimtftools.cxx | 42 +- starmath/qa/cppunit/test_nodetotextvisitors.cxx| 32 +++ 22 files changed, 171 insertions(+), 172 deletions(-) New commits: commit bc536dd1ab7ca452f63460755a1ead89b73d256e Author: Michael Meeks Date: Thu Mar 19 15:39:43 2015 + Fix OutputDevice members / stack allocation: slideshow, starmath, sd, sc. Change-Id: I6d6d41b8a6501ce7d35c78e5b730ea45143d6b73 diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 9189ba8..d4aa8f8 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -575,13 +575,13 @@ void ScGlobal::InitTextHeight(SfxItemPool* pPool) } OutputDevice* pDefaultDev = Application::GetDefaultDevice(); -VirtualDevice aVirtWindow( *pDefaultDev ); -aVirtWindow.SetMapMode(MAP_PIXEL); +ScopedVclPtr pVirtWindow( new VirtualDevice( *pDefaultDev ) ); +pVirtWindow->SetMapMode(MAP_PIXEL); vcl::Font aDefFont; -pPattern->GetFont(aDefFont, SC_AUTOCOL_BLACK, &aVirtWindow); // Font color doesn't matter here -aVirtWindow.SetFont(aDefFont); +pPattern->GetFont(aDefFont, SC_AUTOCOL_BLACK, pVirtWindow); // Font color doesn't matter here +pVirtWindow->SetFont(aDefFont); sal_uInt16 nTest = static_cast( -aVirtWindow.PixelToLogic(Size(0, aVirtWindow.GetTextHeight()), MAP_TWIP).Height()); +pVirtWindow->PixelToLogic(Size(0, pVirtWindow->GetTextHeight()), MAP_TWIP).Height()); if (nTest > nDefFontHeight) nDefFontHeight = nTest; diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx index 1133568..a8ac3d5 100644 --- a/sc/source/filter/rtf/eeimpars.cxx +++ b/sc/source/filter/rtf/eeimpars.cxx @@ -433,8 +433,8 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu // Factor is printer to display ratio double nPPTX = ScGlobal::nScreenPPTX * (double) aZoom / nOutputFactor; double nPPTY = ScGlobal::nScreenPPTY * (double) aZoom; -VirtualDevice aVirtDev; -sc::RowHeightContext aCxt(nPPTX, nPPTY, aZoom, aZoom, &aVirtDev); +ScopedVclPtr pVirtDev( new VirtualDevice() ); +sc::RowHeightContext aCxt(nPPTX, nPPTY, aZoom, aZoom, pVirtDev); aCxt.setExtraHeight(ScGlobal::nLastRowHeightExtra); mpDoc->SetOptimalHeight(aCxt, 0, nEndRow, 0); diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index cb822e2..abf034a 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -336,13 +336,13 @@ bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor, const OUSt Rectangle aMMRect = pDoc->GetMMRect( aBlock.aStart.Col(), aBlock.aStart.Row(), aBlock.aEnd.Col(), aBlock.aEnd.Row(), aBlock.aStart.Tab() ); -VirtualDevice aVirtDev; -aVirtDev.SetOutputSizePixel( aVirtDev.LogicToPixel( aMMRect.GetSize(), MAP_100TH_MM ) ); +ScopedVclPtr pVirtDev( new VirtualDevice() ); +pVirtDev->SetOutputSizePixel( pVirtDev->LogicToPixel( aMMRect.GetSize(), MAP_100TH_MM ) ); -PaintToDev( &aVirtDev, pDoc, 1.0, aBlock, false ); +PaintToDev( pVirtDev, pDoc, 1.0, aBlock, false ); -aVirtDev.SetMapMode( MapMode( MAP_PIXEL ) ); -Bitmap aBmp = aVirtDe
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
7 new defect(s) introduced to LibreOffice found with Coverity Scan.
4 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent
build analyzed by Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 7 of 7 defect(s)
** CID 1288898: Uninitialized members (UNINIT_CTOR)
/vcl/unx/generic/printer/cupsmgr.cxx: 189 in psp::CUPSManager::CUPSManager()()
*** CID 1288898: Uninitialized members (UNINIT_CTOR)
/vcl/unx/generic/printer/cupsmgr.cxx: 189 in psp::CUPSManager::CUPSManager()()
183 m_nDests( 0 ),
184 m_pDests( NULL ),
185 m_bNewDests( false ),
186 m_bPPDThreadRunning( false )
187 {
188 m_aDestThread = osl_createThread( run_dest_thread_stub, this );
>>> CID 1288898: Uninitialized members (UNINIT_CTOR)
>>> Non-static class member "batchMode" is not initialized in this
>>> constructor nor in any functions that it calls.
189 }
190
191 CUPSManager::~CUPSManager()
192 {
193 if( m_aDestThread )
194 {
To view the defects in Coverity Scan visit,
https://scan.coverity.com/projects/211?tab=overview
To manage Coverity Scan email notifications for
"libreoffice@lists.freedesktop.org", click
https://scan.coverity.com/subscriptions/edit?email=libreoffice%40lists.freedesktop.org&token=d6481d718a775246b2340f282ebe5939
.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/printer/cupsmgr.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 2250caf30d5e9fb297e97952a2bc061856701563
Author: Miklos Vajna
Date: Thu Mar 19 17:06:59 2015 +0100
CID 1288898: Uninitialized member
Change-Id: I1523ba22d419a12ae60de4f7afd293fe6cbfb6b5
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx
b/vcl/unx/generic/printer/cupsmgr.cxx
index beb2e1d..c0ece24 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -183,7 +183,8 @@ CUPSManager::CUPSManager() :
m_nDests( 0 ),
m_pDests( NULL ),
m_bNewDests( false ),
-m_bPPDThreadRunning( false )
+m_bPPDThreadRunning( false ),
+batchMode( false )
{
m_aDestThread = osl_createThread( run_dest_thread_stub, this );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/vclref' - svx/source
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 30 ++--
svx/source/dialog/_bmpmask.cxx | 12 ++--
svx/source/dialog/_contdlg.cxx | 26 +-
svx/source/dialog/dlgctrl.cxx | 40
svx/source/dialog/svxruler.cxx | 14 ++---
svx/source/gallery2/galobj.cxx |4 -
svx/source/gallery2/galtheme.cxx|6 +-
svx/source/svdraw/svdfmtf.cxx |8 +--
svx/source/svdraw/svdograf.cxx | 10 ++--
svx/source/svdraw/svdotext.cxx |8 +--
svx/source/svdraw/svdtrans.cxx | 16 +++---
svx/source/svdraw/svdxcgv.cxx | 22
svx/source/tbxctrls/colrctrl.cxx| 14 ++---
svx/source/tbxctrls/fontworkgallery.cxx | 14 ++---
svx/source/tbxctrls/linectrl.cxx| 16 +++---
15 files changed, 120 insertions(+), 120 deletions(-)
New commits:
commit a8f6f46f5dbbc9d1fc74c1ded97bbdda9b1690b1
Author: Michael Meeks
Date: Thu Mar 19 16:19:50 2015 +
Fix OutputDevice members / stack allocation: svx.
Change-Id: Id28aeb44b4c48fec944e21fed7a9acf9f7f8b68a
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 7332449..1b69bc7 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -165,9 +165,9 @@ void CalculateHorizontalScalingFactor( const SdrObject*
pCustomShape,
aFont.SetOrientation( 0 );
// initializing virtual device
-VirtualDevice aVirDev( 1 );
-aVirDev.SetMapMode( MAP_100TH_MM );
-aVirDev.SetFont( aFont );
+ScopedVclPtr pVirDev( new VirtualDevice( 1 ) );
+pVirDev->SetMapMode( MAP_100TH_MM );
+pVirDev->SetFont( aFont );
if ( nOutlinesCount2d & 1 )
bSingleLineMode = true;
@@ -187,7 +187,7 @@ void CalculateHorizontalScalingFactor( const SdrObject*
pCustomShape,
std::vector< FWParagraphData >::const_iterator aParagraphIEnd(
aTextAreaIter->vParagraphs.end() );
while( aParagraphIter != aParagraphIEnd )
{
-double fTextWidth = aVirDev.GetTextWidth( aParagraphIter->aString
);
+double fTextWidth = pVirDev->GetTextWidth( aParagraphIter->aString
);
if ( fTextWidth > 0.0 )
{
double fScale = fWidth / fTextWidth;
@@ -259,12 +259,12 @@ void GetTextAreaOutline( const FWData& rFWData, const
SdrObject* pCustomShape, F
aFont.SetWeight( rWeightItem.GetWeight() );
// initializing virtual device
-VirtualDevice aVirDev( 1 );
-aVirDev.SetMapMode( MAP_100TH_MM );
-aVirDev.SetFont( aFont );
-aVirDev.EnableRTL( true );
+ScopedVclPtr pVirDev( new VirtualDevice( 1 ) );
+pVirDev->SetMapMode( MAP_100TH_MM );
+pVirDev->SetFont( aFont );
+pVirDev->EnableRTL( true );
if ( aParagraphIter->nFrameDirection == FRMDIR_HORI_RIGHT_TOP )
-aVirDev.SetLayoutMode( TEXT_LAYOUT_BIDI_RTL );
+pVirDev->SetLayoutMode( TEXT_LAYOUT_BIDI_RTL );
const SvxCharScaleWidthItem& rCharScaleWidthItem =
static_cast(pCustomShape->GetMergedItem(
EE_CHAR_FONTWIDTH ));
sal_uInt16 nCharScaleWidth = rCharScaleWidthItem.GetValue();
@@ -282,9 +282,9 @@ void GetTextAreaOutline( const FWData& rFWData, const
SdrObject* pCustomShape, F
{
FWCharacterData aCharacterData;
OUString aCharText( (sal_Unicode)rText[ i ] );
-if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines,
aCharText, 0, 0, -1, true, nWidth, pDXArry ) )
+if ( pVirDev->GetTextOutlines( aCharacterData.vOutlines,
aCharText, 0, 0, -1, true, nWidth, pDXArry ) )
{
-sal_Int32 nTextWidth = aVirDev.GetTextWidth(
aCharText);
+sal_Int32 nTextWidth = pVirDev->GetTextWidth(
aCharText);
std::vector< tools::PolyPolygon >::iterator
aOutlineIter = aCharacterData.vOutlines.begin();
std::vector< tools::PolyPolygon >::iterator
aOutlineIEnd = aCharacterData.vOutlines.end();
if ( aOutlineIter == aOutlineIEnd )
@@ -334,13 +334,13 @@ void GetTextAreaOutline( const FWData& rFWData, const
SdrObject* pCustomShape, F
if ( ( nCharScaleWidth != 100 ) && nCharScaleWidth )
{ // applying character spacing
pDXArry = new long[ rText.getLength() ];
-aVirDev.GetTextArray( rText, pDXArry);
-FontMetric aFontMetric( aVirDev.
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f7e67e253c4524f382d988ec058b31b91baea3c6 Author: Andras Timar Date: Thu Mar 19 17:28:28 2015 +0100 Updated core Project: help 325b71813e476e25acbcecbb34f57ec2609ee98b diff --git a/helpcontent2 b/helpcontent2 index 2bd951e..325b718 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2bd951ef710b4a93937519270b19592c8762a626 +Subproject commit 325b71813e476e25acbcecbb34f57ec2609ee98b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: 2 commits - source/text
source/text/scalc/01/04060181.xhp | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 325b71813e476e25acbcecbb34f57ec2609ee98b Author: Andras Timar Date: Thu Mar 19 17:28:28 2015 +0100 fix copypaste: a required parameter cannot be omitted Change-Id: I09ec850aea96962555c526efa0b4c1355236fb2f diff --git a/source/text/scalc/01/04060181.xhp b/source/text/scalc/01/04060181.xhp index 7c1ac57..ade5291 100644 --- a/source/text/scalc/01/04060181.xhp +++ b/source/text/scalc/01/04060181.xhp @@ -268,7 +268,7 @@ oldref="547">COUNTIF Number (required) is the value between Start and End at which to evaluate the function. Alpha (required) is a parameter to the distribution. Beta (required) is a parameter to the distribution. - Cumulative (required) can be 0 or False to calculate the probability density function. It can be any other value or True or omitted to calculate the cumulative distribution function. + Cumulative (required) can be 0 or False to calculate the probability density function. It can be any other value or True to calculate the cumulative distribution function. Start (optional) is the lower bound for Number. End (optional) is the upper bound for Number. commit c8cbe130afa50dacc47c2d1d30e1774d44786a0c Author: Andras Timar Date: Thu Mar 19 17:26:07 2015 +0100 typos: CHI.TEST -> CHISQ.TEST, CHI.DIST -> CHISQ.DIST Change-Id: I2057217b5027283525f570b065f10a04c7165cb2 diff --git a/source/text/scalc/01/04060181.xhp b/source/text/scalc/01/04060181.xhp index a27a4c3..7c1ac57 100644 --- a/source/text/scalc/01/04060181.xhp +++ b/source/text/scalc/01/04060181.xhp @@ -1,6 +1,6 @@ - + - - + + Statistical Functions Part One @@ -530,8 +530,8 @@ oldref="547">COUNTIF CHISQ.TEST -Returns the probability of a deviance from a random distribution of two test series based on the chi-squared test for independence. CHI.TEST returns the chi-squared distribution of the data. -The probability determined by CHI.TEST can also be determined with CHI.DIST, in which case the Chi square of the random sample must then be passed as a parameter instead of the data row. +Returns the probability of a deviance from a random distribution of two test series based on the chi-squared test for independence. CHISQ.TEST returns the chi-squared distribution of the data. +The probability determined by CHISQ.TEST can also be determined with CHISQ.DIST, in which case the Chi square of the random sample must then be passed as a parameter instead of the data row. Syntax CHISQ.TEST(DataB; DataE) DataB is the array of the observations. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source
sw/source/uibase/dbui/dbmgr.cxx |5 - 1 file changed, 5 deletions(-) New commits: commit ea1caeed5cc70f41957d56af0ccb4bfdbd01cb87 Author: Jan-Marek Glogowski Date: Thu Mar 19 15:48:37 2015 +0100 tdf#70346 MM: don't restore section visibility Mail merging the current document is expected to change the source document. So there is no need to try to restore the pre-MM document, even the visibility. In the end any effort is futile, as field changes cannot be undone. Even worse: it introduced a regression using the "data to fields" function from the data source manager (F4), which would never set the correct section visibility. We need to copy the document to prevent changes to the source document and skip the quite probably unexpected save in MM. Change-Id: I814905f1566a63b2ee14cb5f6d08da34c05942aa (cherry picked from commit adb98d94ca1059b56d6b6726ca9aea96ecae8a96) Reviewed-on: https://gerrit.libreoffice.org/14906 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 584efa3..00f4d29 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -441,11 +441,6 @@ bool SwDBManager::MergeNew( const SwMergeDescriptor& rMergeDesc ) DELETEZ( pImpl->pMergeData ); -// Recalculate original section visibility states, as field changes aren't -// tracked (not undo-able). Has to be done, after pImpl->pMergeData is -// gone, otherwise merge data is used for calculation! -rMergeDesc.rSh.SwViewShell::UpdateFlds(); - bInMerge = false; return bRet; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/vclref' - filter/source
filter/source/graphicfilter/eos2met/eos2met.cxx | 37
filter/source/graphicfilter/epict/epict.cxx | 29 +-
filter/source/graphicfilter/eps/eps.cxx | 30 +--
filter/source/graphicfilter/ieps/ieps.cxx | 36 +++
filter/source/msfilter/escherex.cxx | 18 +--
filter/source/msfilter/msdffimp.cxx |6 +--
filter/source/svg/svgfontexport.cxx | 24 +++
7 files changed, 90 insertions(+), 90 deletions(-)
New commits:
commit feb50ac675d194b84743736f571b652221c5e869
Author: Michael Meeks
Date: Thu Mar 19 16:56:13 2015 +
Fix OutputDevice members / stack allocation: filter.
Change-Id: Ib67fd510626809baab774382d37b20462253fc31
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx
b/filter/source/graphicfilter/eos2met/eos2met.cxx
index 36ffc74..0fd0114 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -156,7 +156,7 @@ private:
sal_uInt32 nWrittenBitmaps; // number of already written
Bitmaps
sal_uInt32 nActBitmapPercent; // percentage of the next
bitmap that's already written
-::std::unique_ptr< VirtualDevice > apDummyVDev;
+ScopedVclPtr apDummyVDev;
OutputDevice* pCompDev;
com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator >
xStatusIndicator;
@@ -261,6 +261,7 @@ public:
pCompDev = reinterpret_cast< OutputDevice* >(
Application::GetAppWindow() );
if( !pCompDev )
{
+apDummyVDev.disposeAndClear();
apDummyVDev.reset( new VirtualDevice );
pCompDev = apDummyVDev.get();
}
@@ -1854,12 +1855,12 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
if( aGDIFont.GetAlign() != ALIGN_BASELINE)
{
-VirtualDevice aVDev;
+ScopedVclPtr pVDev( new VirtualDevice() );
if( aGDIFont.GetAlign()==ALIGN_TOP )
-aPt.Y()+=(long)aVDev.GetFontMetric( aGDIFont
).GetAscent();
+aPt.Y()+=(long)pVDev->GetFontMetric( aGDIFont
).GetAscent();
else
-aPt.Y()-=(long)aVDev.GetFontMetric( aGDIFont
).GetDescent();
+aPt.Y()-=(long)pVDev->GetFontMetric( aGDIFont
).GetDescent();
}
METSetMix(eGDIRasterOp);
@@ -1883,11 +1884,11 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
if( aGDIFont.GetAlign() != ALIGN_BASELINE )
{
-VirtualDevice aVDev;
+ScopedVclPtr pVDev( new VirtualDevice() );
if( aGDIFont.GetAlign() == ALIGN_TOP )
-
aPt.Y()+=(long)aVDev.GetFontMetric(aGDIFont).GetAscent();
+
aPt.Y()+=(long)pVDev->GetFontMetric(aGDIFont).GetAscent();
else
-
aPt.Y()-=(long)aVDev.GetFontMetric(aGDIFont).GetDescent();
+
aPt.Y()-=(long)pVDev->GetFontMetric(aGDIFont).GetDescent();
}
METSetMix(eGDIRasterOp);
@@ -1926,7 +1927,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
case META_STRETCHTEXT_ACTION:
{
const MetaStretchTextAction*pA = static_cast(pMA);
-VirtualDevice aVDev;
+ScopedVclPtr pVDev( new VirtualDevice() );
sal_uInt16 i;
sal_Int32 nNormSize;
OUStringaStr;
@@ -1935,14 +1936,14 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
Point aPt( pA->GetPoint() );
Point aPt2;
-aVDev.SetFont( aGDIFont );
+pVDev->SetFont( aGDIFont );
if( aGDIFont.GetAlign() != ALIGN_BASELINE)
{
if( aGDIFont.GetAlign() == ALIGN_TOP )
-aPt.Y()+=(long)aVDev.GetFontMetric().GetAscent();
+aPt.Y()+=(long)pVDev->GetFontMetric().GetAscent();
else
-aPt.Y()-=(long)aVDev.GetFontMetric().GetDescent();
+aPt.Y()-=(long)pVDev->GetFontMetric().GetDescent();
}
METSetMix(eGDIRasterOp);
@@ -1953,7 +1954,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
METSetChrSet(FindChrSet(aGDIFont));
aStr = pA->GetText().copy(pA->GetIndex(),pA->GetLen());
boost::scoped_array pDXAry(new long[aStr.getLength()]);
-nNormSize = aVDev.GetTextArray( aStr, pDXA
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
|5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 2dad7eb36753f9c84bfcc20c456e33104be06482
Author: Miklos Vajna
Date: Thu Mar 19 17:53:38 2015 +0100
android: when in selection, avoid showing the middle handle
editeng sends LOK_CALLBACK_CURSOR_VISIBLE after the text selection is
already created. The effect of this is that after a long push on a word
you get not only the selection overlay + the start/end handles, but also
the middle one, which is not expected. Just check if we're in a
selection already, and if so, don't react to
LOK_CALLBACK_CURSOR_VISIBLE=true.
Change-Id: I939c957feb7889dfb1997fac1051cb4eaa77004c
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
index e9110f6..805ed9c 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
@@ -3,6 +3,7 @@ package org.libreoffice;
import android.content.Intent;
import android.graphics.RectF;
import android.net.Uri;
+import android.util.Log;
import org.libreoffice.kit.Document;
import org.mozilla.gecko.TextSelection;
@@ -211,7 +212,9 @@ public class InvalidationHandler implements
Document.MessageCallback {
private synchronized void cursorVisibility(String payload) {
if (payload.equals("true")) {
mTextCursorLayer.showCursor();
-mTextSelection.showHandle(TextSelectionHandle.HandleType.MIDDLE);
+if (mState != OverlayState.SELECTION) {
+
mTextSelection.showHandle(TextSelectionHandle.HandleType.MIDDLE);
+}
} else if (payload.equals("false")) {
mTextCursorLayer.hideCursor();
mTextSelection.hideHandle(TextSelectionHandle.HandleType.MIDDLE);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: New Defects reported by Coverity Scan for LibreOffice
On Thu, 2015-03-19 at 08:58 -0700, scan-ad...@coverity.com wrote: > Hi, > > Please find the latest report on new defect(s) introduced to LibreOffice > found with Coverity Scan. caolanm->Tamás: cid#1288897 after f7424ed710e54bb2437a28380b03ed7c26290edc SdTabTemplateDlg::GetRefreshedSet->SdTabTemplateDlg::RefreshInputSet has a leaky "pRet = new SfxItemSet" in it now, what's the right fix there ? caolanm->Bjoern: cid#1288896 after b0dae8c4c57aa50bbff7b3fd4d84476636bf1677 SwModify::ModifyBroadcast now has... while(aIter.m_pPosition && !aIter.m_pPosition->IsA( nType ) ) ... aIter.m_pCurrent = aIter.m_pPosition; aIter->Modify( pOldValue, pNewValue ); which suggests that m_pCurrent can be NULL because of the m_pPosition check, and so the deref of aIter derefs the NULL m_pCurrent ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/04060181.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit be139ba7c2e4eef2c529c8506820641185867ae0 Author: Andras Timar Date: Thu Mar 19 18:10:21 2015 +0100 fix copypaste: a required parameter cannot be omitted Change-Id: Ibfa020c85212d4df6d35925e3f89bab044c996a7 diff --git a/source/text/scalc/01/04060181.xhp b/source/text/scalc/01/04060181.xhp index ade5291..76c0847 100644 --- a/source/text/scalc/01/04060181.xhp +++ b/source/text/scalc/01/04060181.xhp @@ -649,7 +649,7 @@ oldref="547">COUNTIF CHISQ.DIST(Number; DegreesFreedom; Cumulative) Number is the chi-square value of the random sample used to determine the error probability. DegreesFreedom are the degrees of freedom of the experiment. -Cumulative can be 0 or False to calculate the probability density function. It can be any other value or True or omitted to calculate the cumulative distribution function. +Cumulative can be 0 or False to calculate the probability density function. It can be any other value or True to calculate the cumulative distribution function. Example =CHISQ.DIST(3; 2; 0) equals 0.1115650801, the probability density function with 2 degrees of freedom, at x = 3. =CHISQ.DIST(3; 2; 1) equals 0.7768698399, the cumulative chi-square distribution with 2 degrees of freedom, at the value x = 3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 45ad2b6f0fe4528995ca1eca7539857a95e4e848 Author: Andras Timar Date: Thu Mar 19 18:10:21 2015 +0100 Updated core Project: help be139ba7c2e4eef2c529c8506820641185867ae0 diff --git a/helpcontent2 b/helpcontent2 index 325b718..be139ba 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 325b71813e476e25acbcecbb34f57ec2609ee98b +Subproject commit be139ba7c2e4eef2c529c8506820641185867ae0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/vclref' - filter/source reportdesign/source uui/source
filter/source/flash/swfwriter.cxx |2 +-
filter/source/flash/swfwriter.hxx |2 +-
filter/source/graphicfilter/eos2met/eos2met.cxx |2 +-
filter/source/graphicfilter/eps/eps.cxx | 10 +-
filter/source/graphicfilter/icgm/cgm.cxx|2 +-
filter/source/graphicfilter/icgm/cgm.hxx|2 +-
filter/source/graphicfilter/idxf/dxf2mtf.cxx|2 +-
filter/source/graphicfilter/idxf/dxf2mtf.hxx|2 +-
filter/source/graphicfilter/ios2met/ios2met.cxx |4 ++--
filter/source/graphicfilter/ipict/ipict.cxx |4 ++--
filter/source/svg/svgwriter.cxx |2 +-
filter/source/svg/svgwriter.hxx |4 ++--
reportdesign/source/ui/inc/ColorChanger.hxx |2 +-
uui/source/fltdlg.cxx |4 ++--
14 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 6a1532d89a2e50bc7775f5b21e0881925bce66d4
Author: Michael Meeks
Date: Thu Mar 19 17:16:37 2015 +
Move OutputDevice members to VclPtr: filter, reportdesign, uui.
Change-Id: Iafac8812714a0be68f5608f657c76c159f2912a0
diff --git a/filter/source/flash/swfwriter.cxx
b/filter/source/flash/swfwriter.cxx
index ded932b..4d1ad68 100644
--- a/filter/source/flash/swfwriter.cxx
+++ b/filter/source/flash/swfwriter.cxx
@@ -100,7 +100,7 @@ Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32
nTWIPHeightOutput, sal_Int
Writer::~Writer()
{
-delete mpVDev;
+mpVDev.disposeAndClear();
delete mpSprite;
delete mpTag;
}
diff --git a/filter/source/flash/swfwriter.hxx
b/filter/source/flash/swfwriter.hxx
index efa2247..8355bc4 100644
--- a/filter/source/flash/swfwriter.hxx
+++ b/filter/source/flash/swfwriter.hxx
@@ -395,7 +395,7 @@ private:
sal_uInt16 mnWhiteBackgroundShapeId;
sal_uInt16 mnPageButtonId;
-VirtualDevice* mpVDev;
+VclPtr mpVDev;
const tools::PolyPolygon* mpClipPolyPolygon;
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx
b/filter/source/graphicfilter/eos2met/eos2met.cxx
index 0fd0114..66a2773 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -157,7 +157,7 @@ private:
sal_uInt32 nActBitmapPercent; // percentage of the next
bitmap that's already written
ScopedVclPtr apDummyVDev;
-OutputDevice* pCompDev;
+VclPtr pCompDev;
com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator >
xStatusIndicator;
diff --git a/filter/source/graphicfilter/eps/eps.cxx
b/filter/source/graphicfilter/eps/eps.cxx
index 06acb9a..8832ca6 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -257,7 +257,7 @@ PSWriter::PSWriter()
, mpPS(NULL)
, pMTF(NULL)
, pAMTF(NULL)
-, aVDev()
+, pVDev()
, nBoundingX1(0)
, nBoundingY1(0)
, nBoundingX2(0)
@@ -419,13 +419,13 @@ bool PSWriter::WritePS( const Graphic& rGraphic,
SvStream& rTargetStream, Filter
Bitmap aBmp( rGraphic.GetBitmap() );
pAMTF = new GDIMetaFile();
ScopedVclPtr pTmpVDev(new VirtualDevice());
-pAMTF->Record( &aTmpVDev );
+pAMTF->Record( pTmpVDev );
pTmpVDev->DrawBitmap( Point(), aBmp );
pAMTF->Stop();
pAMTF->SetPrefSize( aBmp.GetSizePixel() );
pMTF = pAMTF;
}
-aVDev.SetMapMode( pMTF->GetPrefMapMode() );
+pVDev->SetMapMode( pMTF->GetPrefMapMode() );
nBoundingX1 = nBoundingY1 = 0;
nBoundingX2 = pMTF->GetPrefSize().Width();
nBoundingY2 = pMTF->GetPrefSize().Height();
@@ -454,7 +454,7 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream&
rTargetStream, Filter
{
ImplWriteProlog( ( mnPreview & EPS_PREVIEW_EPSI ) ? &rGraphic : NULL );
mnCursorPos = 0;
-ImplWriteActions( *pMTF, aVDev );
+ImplWriteActions( *pMTF, *pVDev.get() );
ImplWriteEpilog();
if ( mnPreview & EPS_PREVIEW_TIFF )
{
@@ -1608,7 +1608,7 @@ void PSWriter::ImplIntersect( const tools::PolyPolygon&
rPolyPoly )
void PSWriter::ImplWriteGradient( const tools::PolyPolygon& rPolyPoly, const
Gradient& rGradient, VirtualDevice& rVDev )
{
-ScopedVclPtr l_pVirDev( new VirtualDevice() );
+ScopedVclPtr l_pVDev( new VirtualDevice() );
GDIMetaFile aTmpMtf;
l_pVDev->SetMapMode( rVDev.GetMapMode() );
l_pVDev->AddGradientActions( rPolyPoly.GetBoundRect(), rGradient, aTmpMtf
);
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx
b/filter/source/graphicfilter/icgm/cgm.cxx
index fdf2582..7abfe96 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -80,7 +80,7 @@ CGM::~CGM()
mpGDIMetaFile->Stop();
mpGDIMetaFile->SetPrefMapMode( MapMode() );
mpGDIMetaFile->SetPrefSize( Size( static_cast< long >( mnOutdx ),
static_cast< long >( mnOutdy ) ) )
Re: Summer of Code (March 17,2015)
Am 19.03.2015 um 10:20 schrieb Caolán McNamara: > On Wed, 2015-03-18 at 21:04 +0200, Efe Gürkan YALAMAN wrote: >> >> Somewhere in the bugzilla I think Caolan mentioned it can be >> implemented as a tree-view because the options are in a tree structure >> and it would fit better then a simple table. Also it solves the >> dialog's usability issues too. I hope that will solve the >> accessibility problems too. > > Yeah, I think that's the best approach, to try and use a tree in there. > (a SvTreeList I suppose) because the amount of elements in the list is > just crazy, 30,000+ IIRC. Ideally on-demand loaded, e.g. tree is > collapsed and just shows +com.sun.star, when you expand that, then only > then is the subtree inserted, and so on. So the full 30,000+ list isn't > actually in the widget, only the expanded portion. Not sure if it would be better - performance wise. I guess most people actually want to search and I'm not sure if it's better to rebuild the tree with partial data based on the search string. Is the tree view able to filter the content, like the Gtk+ one allows via GtkTreeModelFilter? JMG ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - include/vcl solenv/bin vcl/opengl vcl/source
include/vcl/salbtype.hxx|2 +-
solenv/bin/unittest-failed.sh | 31 ---
vcl/opengl/gdiimpl.cxx |2 +-
vcl/source/opengl/OpenGLContext.cxx |2 +-
4 files changed, 19 insertions(+), 18 deletions(-)
New commits:
commit f3c0085d966d4a8e2223326c52c045b7529ef320
Author: Jan Holesovsky
Date: Thu Mar 19 18:06:27 2015 +0100
opengl: Off-by-one in getPixel.
Change-Id: I971d94c353adcdf70e0f251d6103b1e19042687c
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index baf04ff..5ed9db6 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1529,7 +1529,7 @@ SalColor OpenGLSalGraphicsImpl::getPixel( long nX, long
nY )
char pixel[3] = { 0, 0, 0 };
PreDraw();
-nY = GetHeight() - nY;
+nY = GetHeight() - nY - 1;
glReadPixels( nX, nY, 1, 1, GL_RGB, GL_UNSIGNED_BYTE, pixel);
PostDraw();
commit 3637dc8a573b025106b4a652d837458c2e427d14
Author: Jan Holesovsky
Date: Thu Mar 19 15:56:12 2015 +0100
opengl: We need to return the GLWindow.
Fixes an unitialized read in wglDeleteContext, thanks Dr.Memory!
Change-Id: I3706b18526c48277f9b4a6801c95c26a10a86965
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index 352b630..09b0257 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -180,7 +180,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
WPARAM wParam, LPARAM l
}
}
-int InitTempWindow(HWND *hwnd, int width, int height, const
PIXELFORMATDESCRIPTOR& inPfd, GLWindow glWin)
+int InitTempWindow(HWND *hwnd, int width, int height, const
PIXELFORMATDESCRIPTOR& inPfd, GLWindow& glWin)
{
PIXELFORMATDESCRIPTOR pfd = inPfd;
int pfmt;
commit 8e0d758f852b0b4e4242b7fb2ebee8cbd17fc2f4
Author: Jan Holesovsky
Date: Thu Mar 19 15:35:04 2015 +0100
Hint how to use Dr.Memory for unit tests / memory checking.
Change-Id: I7df8716e90e9097336919d2a9208a549b8f7d3d0
diff --git a/solenv/bin/unittest-failed.sh b/solenv/bin/unittest-failed.sh
index 6bbd458..b1e93d5 100755
--- a/solenv/bin/unittest-failed.sh
+++ b/solenv/bin/unittest-failed.sh
@@ -17,27 +17,28 @@
# except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-cat << EOF
-
-Error: a unit test failed, please do one of:
+ECHECKING='export DEBUGCPPUNIT=TRUE# for exception catching'
+DEBUGGING=
+MCHECKING='export VALGRIND=memcheck# for memory checking'
-export DEBUGCPPUNIT=TRUE# for exception catching
-EOF
if [ "$3" = "WNT" ]; then
-cat << EOF
-export CPPUNITTRACE="\"[full path to devenv.exe]\" /debugexe" # for
interactive debugging in Visual Studio
-EOF
+ECHECKING='export DEBUGCPPUNIT=TRUE #
for exception catching'
+DEBUGGING='export CPPUNITTRACE="\"[full path to devenv.exe]\" /debugexe" #
for interactive debugging in Visual Studio'
+MCHECKING='export CPPUNITTRACE="drmemory -free_max_frames 20"#
for memory checking (install Dr.Memory first)'
elif [ "$3" = "MACOSX" ]; then
-cat << EOF
-export CPPUNITTRACE="lldb --" # for interactive debugging on OS X
-EOF
+DEBUGGING='export CPPUNITTRACE="lldb --" # for interactive debugging
on OS X'
else
-cat << EOF
-export CPPUNITTRACE="gdb --args"# for interactive debugging on Linux
-EOF
+DEBUGGING='export CPPUNITTRACE="gdb --args"# for interactive debugging
on Linux'
fi
+
+# print the actual error message
cat << EOF
-export VALGRIND=memcheck# for memory checking
+
+Error: a unit test failed, please do one of:
+
+$ECHECKING
+$DEBUGGING
+$MCHECKING
and retry using: make $1Test_$2
commit 684aec5496f7394969743614cfda12b11c0466af
Author: Jan Holesovsky
Date: Tue Mar 17 12:44:36 2015 +0100
Dr.Memory complains about this...
Change-Id: I00ad970ab7cc97cfa37d6785540d6cfa825976c8
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index 40dfd8f..1dd62c2 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -406,7 +406,7 @@ inline BitmapColor& BitmapColor::Invert()
inline sal_uInt8 BitmapColor::GetLuminance() const
{
DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" );
-return( (sal_uInt8) ( ( mcBlueOrIndex * 28UL + mcGreen * 151UL + mcRed *
77UL ) >> 8UL ) );
+return (unsigned long(mcBlueOrIndex) * 28UL + unsigned long(mcGreen) *
151UL + unsigned long(mcRed) * 77UL) >> 8;
}
inline BitmapColor& BitmapColor::IncreaseLuminance( sal_uInt8 cGreyInc )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/vclref' - 2 commits - basctl/source canvas/source chart2/source cui/source dbaccess/source sfx2/source
basctl/source/basicide/basdoc.cxx|3 +++
basctl/source/basicide/basdoc.hxx|2 +-
canvas/source/cairo/cairo_cairo.hxx |3 ++-
canvas/source/cairo/cairo_canvasfont.cxx |2 +-
canvas/source/cairo/cairo_canvashelper.cxx |4 ++--
canvas/source/cairo/cairo_canvashelper.hxx |4 +++-
canvas/source/cairo/cairo_canvashelper_text.cxx |4 ++--
canvas/source/cairo/cairo_devicehelper.cxx |2 +-
canvas/source/cairo/cairo_devicehelper.hxx |2 +-
canvas/source/cairo/cairo_quartz_cairo.cxx |4 ++--
canvas/source/cairo/cairo_quartz_cairo.hxx |2 +-
canvas/source/cairo/cairo_win32_cairo.cxx|4 ++--
canvas/source/cairo/cairo_win32_cairo.hxx|2 +-
canvas/source/cairo/cairo_xlib_cairo.cxx |4 ++--
canvas/source/cairo/cairo_xlib_cairo.hxx |2 +-
chart2/source/controller/dialogs/DataBrowser.cxx |4 ++--
cui/source/inc/page.hxx |2 +-
cui/source/tabpages/page.cxx |3 +--
dbaccess/source/ui/browser/dataview.cxx |2 +-
dbaccess/source/ui/inc/ConnectionLine.hxx|2 +-
sfx2/source/doc/printhelper.cxx |4 ++--
21 files changed, 33 insertions(+), 28 deletions(-)
New commits:
commit 84648f990ff80946423ea3e48e6dfa85563e33e4
Author: Michael Meeks
Date: Thu Mar 19 17:21:42 2015 +
Move OutputDevice members to VclPtr: dbaccess, canvas.
Change-Id: Iae01ddcb6a0cde3be1bd79200e9177983be2f924
diff --git a/basctl/source/basicide/basdoc.cxx
b/basctl/source/basicide/basdoc.cxx
index d11bf03..2f00c5c 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -66,7 +66,10 @@ SfxPrinter* DocShell::GetPrinter( bool bCreate )
void DocShell::SetPrinter( SfxPrinter* pPr )
{
if (pPr != pPrinter.get())
+{
+pPrinter.disposeAndClear();
pPrinter.reset(pPr);
+}
}
void DocShell::FillClass( SvGlobalName*, sal_uInt32*, OUString*, OUString*,
OUString*, sal_Int32, bool bTemplate) const
diff --git a/basctl/source/basicide/basdoc.hxx
b/basctl/source/basicide/basdoc.hxx
index f86bff4..f8eaf6a 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -33,7 +33,7 @@ namespace basctl
class DocShell: public SfxObjectShell
{
-boost::scoped_ptr pPrinter;
+ScopedVclPtr pPrinter;
protected:
virtual voidDraw( OutputDevice *, const JobSetup & rSetup,
diff --git a/canvas/source/cairo/cairo_cairo.hxx
b/canvas/source/cairo/cairo_cairo.hxx
index 10c9203..c03c09b 100644
--- a/canvas/source/cairo/cairo_cairo.hxx
+++ b/canvas/source/cairo/cairo_cairo.hxx
@@ -22,6 +22,7 @@
#include
#include
+#include
struct SystemEnvData;
struct BitmapSystemData;
@@ -61,7 +62,7 @@ namespace cairo {
virtual boost::shared_ptr getSimilar( Content aContent, int
width, int height ) const = 0;
/// factory for VirDev on this surface
-virtual boost::shared_ptr createVirtualDevice() const =
0;
+virtual VclPtr createVirtualDevice() const = 0;
/// Resize the surface (possibly destroying content)
virtual void Resize( int width, int height ) = 0;
diff --git a/canvas/source/cairo/cairo_canvasfont.cxx
b/canvas/source/cairo/cairo_canvasfont.cxx
index 62bf3e2..be07a54 100644
--- a/canvas/source/cairo/cairo_canvasfont.cxx
+++ b/canvas/source/cairo/cairo_canvasfont.cxx
@@ -63,7 +63,7 @@ namespace cairocanvas
// adjust to stretched/shrunk font
if( !::rtl::math::approxEqual( rFontMatrix.m00, rFontMatrix.m11) )
{
-OutputDevice* pOutDev( mpRefDevice->getOutputDevice() );
+VclPtr pOutDev( mpRefDevice->getOutputDevice() );
if( pOutDev )
{
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx
b/canvas/source/cairo/cairo_canvashelper.cxx
index 68e05fe..ecdfea3 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -83,7 +83,7 @@ namespace cairocanvas
{
mpSurface.reset();
mpCairo.reset();
-mpVirtualDevice.reset();
+mpVirtualDevice.disposeAndClear();
mpDevice = NULL;
mpSurfaceProvider = NULL;
}
@@ -105,7 +105,7 @@ namespace cairocanvas
void CanvasHelper::setSurface( const SurfaceSharedPtr& pSurface, bool
bHasAlpha )
{
mbHaveAlpha = bHasAlpha;
-mpVirtualDevice.reset();
+mpVirtualDevice.disposeAndClear();
mpSurface = pSurface;
mpCairo = pSurface->getCairo();
}
diff --git a/canvas/source/cairo/cairo_canvashelper.hxx
b/canvas/source/cairo/cairo_canvashelper.hxx
index f6f0099..9efbb80 100644
--- a/canvas/source/cairo/cairo_canvashelper.hxx
+++ b/canvas/source/cairo/cairo_canvashelper.hxx
@@ -28,6 +28,8 @@
#include
#include
+#include
+#include
#include
#include "cairo_cairo.hxx"
@
[Libreoffice-commits] core.git: Branch 'feature/vclref' - include/svx starmath/inc starmath/source svx/inc svx/source
include/svx/dialcontrol.hxx |6
include/svx/dlgctrl.hxx |4
include/svx/float3d.hxx |2
include/svx/numvset.hxx |2
starmath/inc/dialog.hxx |4
starmath/inc/smmod.hxx |2
starmath/inc/visitors.hxx|2
starmath/source/smmod.cxx|2
svx/inc/sdr/overlay/overlaymanagerbuffered.hxx |4
svx/source/dialog/dlgctrl.cxx|2
svx/source/dialog/fntctrl.cxx|6
svx/source/dialog/frmsel.cxx | 31 ++--
svx/source/dialog/svxbmpnumvalueset.cxx |2
svx/source/engine3d/float3d.cxx |2
svx/source/form/fmobj.cxx|4
svx/source/inc/fmobj.hxx |2
svx/source/inc/frmselimpl.hxx|2
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx |6
svx/source/sdr/overlay/overlaymanagerbuffered.cxx| 98 +++
svx/source/sidebar/line/LineWidthValueSet.cxx|5
svx/source/sidebar/line/LineWidthValueSet.hxx|2
svx/source/svdraw/svdfmtf.cxx| 46 +++
svx/source/svdraw/svdfmtf.hxx| 36 ++---
23 files changed, 136 insertions(+), 136 deletions(-)
New commits:
commit 4f56dc7e40baa53f31a454e28a1eae5a7ab3dde2
Author: Michael Meeks
Date: Thu Mar 19 17:47:31 2015 +
Move OutputDevice members to VclPtr: starmath, svx.
Change-Id: I1a5174334f41bc319e0806b9d324be64ba6d0135
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index 7519a2c..e8d8a88 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -126,9 +126,9 @@ public:
protected:
struct DialControl_Impl
{
-::boost::scoped_ptr mpBmpEnabled;
-::boost::scoped_ptr mpBmpDisabled;
-::boost::scoped_ptr mpBmpBuffered;
+ScopedVclPtr mpBmpEnabled;
+ScopedVclPtr mpBmpDisabled;
+ScopedVclPtr mpBmpBuffered;
LinkmaModifyHdl;
VclPtr mpLinkField;
sal_Int32 mnLinkedFieldValueMultiplyer;
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index e18d4d6..a3f237f 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -358,8 +358,8 @@ class SdrModel;
class SvxPreviewBase : public Control
{
private:
-SdrModel* mpModel;
-VirtualDevice* mpBufferDevice;
+SdrModel* mpModel;
+VclPtr mpBufferDevice;
protected:
void InitSettings(bool bForeground, bool bBackground);
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index f7912c7..5b47add 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -191,7 +191,7 @@ private:
// Model, Page, View etc. for favourites
FmFormModel*pModel;
-VirtualDevice* pVDev;
+VclPtr pVDev;
E3dView*p3DView;
SfxBindings*pBindings;
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index 15161dc..7bd523e 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -52,7 +52,7 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
sal_uInt16 nPageType;
boolbHTMLMode;
Rectangle aOrgRect;
-VirtualDevice* pVDev;
+VclPtr pVDev;
com::sun::star::uno::Reference
xFormatter;
com::sun::star::lang::Locale aLocale;
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 776000a..3865c5b 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -153,7 +153,7 @@ class SmFontTypeDialog : public ModalDialog
VclPtr m_pMenuButton;
VclPtr m_pDefaultButton;
-OutputDevice *pFontListDev;
+VclPtr pFontListDev;
DECL_LINK(MenuSelectHdl, Menu *);
DECL_LINK(DefaultButtonClickHdl, Button *);
@@ -358,7 +358,7 @@ class SmSymbolDialog : public ModalDialog
OUString aSymbolSetName;
SymbolPtrVec_t aSymbolSet;
-OutputDevice *pFontListDev;
+VclPtr pFontListDev;
DECL_LINK(SymbolSetChangeHdl, void*);
DECL_LINK(SymbolChangeHdl, void*);
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index a49d8ca..a2b57ec 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -90,7 +90,7 @@ class SmModule : public SfxModule, utl::ConfigurationListener
SmConfig*pConfig;
SmLocalizedSymbolData *pLocSymbolData;
SvtSysLocale*pSysLocale;
-VirtualDevice *pVirtualDev;
+VclPtrpVirtualDev;
[Libreoffice-commits] core.git: include/vcl
include/vcl/salbtype.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 33d2475d9f2f01308ba4675ac99aaabb43870e0f
Author: Tor Lillqvist
Date: Thu Mar 19 20:13:01 2015 +0200
Revert "Dr.Memory complains about this..."
Obviously some thinko, does not compile.
This reverts commit 684aec5496f7394969743614cfda12b11c0466af.
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index 1dd62c2..40dfd8f 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -406,7 +406,7 @@ inline BitmapColor& BitmapColor::Invert()
inline sal_uInt8 BitmapColor::GetLuminance() const
{
DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" );
-return (unsigned long(mcBlueOrIndex) * 28UL + unsigned long(mcGreen) *
151UL + unsigned long(mcRed) * 77UL) >> 8;
+return( (sal_uInt8) ( ( mcBlueOrIndex * 28UL + mcGreen * 151UL + mcRed *
77UL ) >> 8UL ) );
}
inline BitmapColor& BitmapColor::IncreaseLuminance( sal_uInt8 cGreyInc )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl
include/vcl/salbtype.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a25fa1cb0266bb8461323b5d856c3c979d538114
Author: Tor Lillqvist
Date: Thu Mar 19 20:24:39 2015 +0200
MSVC and gcc are wrong, Clang was right, apparently
The 'unsigned int(expression)' syntax is *not* correct, says
http://en.cppreference.com/w/cpp/language/explicit_cast, but
apparently MSVC and gcc don't mind. Clang doesn't like it, though.
Re-introduce kendy's change but use static_cast instead of functional
cast.
This reverts commit 33d2475d9f2f01308ba4675ac99aaabb43870e0f
Change-Id: I799cce13e9bebf1a375243c294c4fa8788502ec6
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index 40dfd8f..d5bbc73 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -406,7 +406,7 @@ inline BitmapColor& BitmapColor::Invert()
inline sal_uInt8 BitmapColor::GetLuminance() const
{
DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" );
-return( (sal_uInt8) ( ( mcBlueOrIndex * 28UL + mcGreen * 151UL + mcRed *
77UL ) >> 8UL ) );
+return (static_cast(mcBlueOrIndex) * 28UL +
static_cast(mcGreen) * 151UL + static_cast(mcRed)
* 77UL) >> 8;
}
inline BitmapColor& BitmapColor::IncreaseLuminance( sal_uInt8 cGreyInc )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Enes Ateş - licence statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. -- Enes Ateş ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/vclref' - filter/source sw/qa sw/source vcl/workben
filter/source/graphicfilter/icgm/cgm.hxx |1 + sw/qa/tiledrendering/tiledrendering.cxx |6 +++--- sw/source/core/frmedt/fecopy.cxx |2 +- sw/source/core/layout/paintfrm.cxx |8 vcl/workben/vcldemo.cxx | 30 +++--- 5 files changed, 24 insertions(+), 23 deletions(-) New commits: commit fe7412b0560366f7e0f3927ba9966fbc99e98cf6 Author: Michael Meeks Date: Thu Mar 19 19:07:14 2015 + vclptr: misc. bug fixing. Change-Id: Id56188c0f72b74bc9ce6eed558a8339d4175d628 diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx index c6c0fa6..e851819 100644 --- a/filter/source/graphicfilter/icgm/cgm.hxx +++ b/filter/source/graphicfilter/icgm/cgm.hxx @@ -28,6 +28,7 @@ #include #include +#include #include "cgmtypes.hxx" class Graphic; diff --git a/sw/qa/tiledrendering/tiledrendering.cxx b/sw/qa/tiledrendering/tiledrendering.cxx index 73845bd..82ffe0c 100644 --- a/sw/qa/tiledrendering/tiledrendering.cxx +++ b/sw/qa/tiledrendering/tiledrendering.cxx @@ -130,14 +130,14 @@ IMPL_LINK ( TiledRenderingDialog, RenderHdl, Button *, EMPTYARG ) // // SystemGraphicsData aData; // [setup the aData] -// VirtualDevice aDevice(&aData, [color depth]); +// VirtualDevice pDevice(&aData, [color depth]); ScopedVclPtr< VirtualDevice > pDevice(new VirtualDevice()); // paint to it pViewShell->PaintTile(*pDevice.get(), contextWidth, contextHeight, tilePosX, tilePosY, tileWidth, tileHeight); -// copy the aDevice content to mpImage -Bitmap aBitmap(pDevice->GetBitmap(aDevice->PixelToLogic(Point(0,0)), pDevice->PixelToLogic(Size(contextWidth, contextHeight; +// copy the pDevice content to mpImage +Bitmap aBitmap(pDevice->GetBitmap(pDevice->PixelToLogic(Point(0,0)), pDevice->PixelToLogic(Size(contextWidth, contextHeight; mpImage->SetImage(Image(aBitmap)); // update the dialog size diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index 69dc7e8..6274e97 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -1241,7 +1241,7 @@ bool SwFEShell::GetDrawObjGraphic( sal_uLong nFmt, Graphic& rGrf ) const GDIMetaFile aMtf; aMtf.Record( pVirtDev.get() ); -aGrf.Draw( &aVirtDev, aPt, aSz ); +aGrf.Draw( pVirtDev, aPt, aSz ); aMtf.Stop(); aMtf.SetPrefMapMode( aTmp ); aMtf.SetPrefSize( aSz ); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index b408f36..ecdc339 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -7675,7 +7675,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap ) vcl::Window *pWin = pSh->GetWin(); sal_uInt16 nZoom = pSh->GetViewOptions()->GetZoom(); -::SetOutDevAndWin( pSh, &aDev, 0, 100 ); +::SetOutDevAndWin( pSh, pDev, 0, 100 ); gProp.bSFlyMetafile = true; gProp.pSFlyMetafileOut = pWin; @@ -7693,15 +7693,15 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap ) pImp->PaintLayer( pIDDMA->GetHellId(), 0, aOut, &aPageBackgrdColor, pFlyPage->IsRightToLeft(), &aSwRedirector ); -gProp.pSLines->PaintLines( &aDev, gProp ); +gProp.pSLines->PaintLines( pDev, gProp ); if ( pFly->IsFlyInCntFrm() ) pFly->Paint( aOut ); -gProp.pSLines->PaintLines( &aDev, gProp ); +gProp.pSLines->PaintLines( pDev, gProp ); // OD 30.08.2002 #102450# - add 3rd parameter pImp->PaintLayer( pIDDMA->GetHeavenId(), 0, aOut, &aPageBackgrdColor, pFlyPage->IsRightToLeft(), &aSwRedirector ); -gProp.pSLines->PaintLines( &aDev, gProp ); +gProp.pSLines->PaintLines( pDev, gProp ); DELETEZ( gProp.pSLines ); gProp.pSFlyOnlyDraw = 0; diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 8936553..0cd32fe 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -807,18 +807,18 @@ public: // Compositing onto 2x colors beyond our control ScopedVclPtr< VirtualDevice > aWhite(new VirtualDevice()); ScopedVclPtr< VirtualDevice > aBlack(new VirtualDevice()); -aWhite.SetOutputSizePixel(aSrc.GetSizePixel()); -aWhite.SetBackground(Wallpaper(COL_WHITE)); -aWhite.Erase(); -aBlack.SetOutputSizePixel(aSrc.GetSizePixel()); -aBlack.SetBackground(Wallpaper(COL_BLACK)); -aBlack.Erase(); -aWhite.DrawBitmapEx(Point(), aSrc); -aBlack.DrawBitmapEx(Point
[Libreoffice-commits] core.git: 2 commits - vcl/inc vcl/win
vcl/inc/win/salgdi.h |3 +++
vcl/win/source/gdi/salgdi.cxx|3 ++-
vcl/win/source/gdi/salnativewidgets-luna.cxx | 10 ++
3 files changed, 11 insertions(+), 5 deletions(-)
New commits:
commit 5b0f3cf836054da94968eddffc2647b50236739e
Author: Jan Holesovsky
Date: Thu Mar 19 20:24:07 2015 +0100
opengl dr.memory: DC that contains selected object being deleted.
Change-Id: I3cfb09eacfa129a92dace47fd26ccf6e5d1a6756
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 287daf4..e956e0f 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -155,6 +155,9 @@ private:
/// DIBSection that we use for the GDI drawing, and later obtain.
HBITMAP mhBitmap;
+/// Return the previous bitmap to undo the SelectObject.
+HBITMAP mhOrigBitmap;
+
/// DIBSection data.
sal_uInt32 *mpData;
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index fc74d05..ff74b0f 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -582,13 +582,14 @@ OpenGLCompatibleDC::OpenGLCompatibleDC(SalGraphics
&rGraphics, int x, int y, int
mhBitmap = WinSalVirtualDevice::ImplCreateVirDevBitmap(mhCompatibleDC,
width, height, 32, reinterpret_cast(&mpData));
-SelectObject(mhCompatibleDC, mhBitmap);
+mhOrigBitmap = (HBITMAP) SelectObject(mhCompatibleDC, mhBitmap);
}
OpenGLCompatibleDC::~OpenGLCompatibleDC()
{
if (mpImpl)
{
+SelectObject(mhCompatibleDC, mhOrigBitmap);
DeleteObject(mhBitmap);
DeleteDC(mhCompatibleDC);
}
commit a175977e1eb7fe63b2314dcfb3944e87889af455
Author: Jan Holesovsky
Date: Thu Mar 19 20:11:31 2015 +0100
dr.memory: Deleting a drawing object that is selected into DC.
Change-Id: I2b04152896cdd231cc9be4ab008bc57a65c840da
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx
b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 9b690db..aedbf89 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -475,12 +475,13 @@ static void impl_drawAeroToolbar( HDC hDC, RECT rc, bool
bHorizontal )
// and a darker horizontal line under that
HPEN hpen = CreatePen( PS_SOLID, 1, RGB( 0xb0, 0xb0, 0xb0 ) );
-SelectObject( hDC, hpen );
+HPEN hOrigPen = (HPEN) SelectObject(hDC, hpen);
MoveToEx( hDC, rc.left, gradient_bottom, NULL );
LineTo( hDC, rc.right, gradient_bottom );
-DeleteObject( hpen );
+SelectObject(hDC, hOrigPen);
+DeleteObject(hpen);
}
else
{
@@ -500,12 +501,13 @@ static void impl_drawAeroToolbar( HDC hDC, RECT rc, bool
bHorizontal )
from_y = to_y = rc.top;
HPEN hpen = CreatePen( PS_SOLID, 1, RGB( 0xb0, 0xb0, 0xb0 ) );
-SelectObject( hDC, hpen );
+HPEN hOrigPen = (HPEN) SelectObject(hDC, hpen);
MoveToEx( hDC, from_x, from_y, NULL );
LineTo( hDC, to_x, to_y );
-DeleteObject( hpen );
+SelectObject(hDC, hOrigPen);
+DeleteObject(hpen);
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/Executable_pixelctl.mk vcl/Executable_mtfdemo.mk vcl/Executable_outdevgrind.mk vcl/Executable_svdemo.mk vcl/Executable_svpclient.mk vcl/Executable_svptest.mk vcl/Ex
svx/Executable_pixelctl.mk |1 - vcl/Executable_mtfdemo.mk |1 - vcl/Executable_outdevgrind.mk |1 - vcl/Executable_svdemo.mk|1 - vcl/Executable_svpclient.mk |1 - vcl/Executable_svptest.mk |1 - vcl/Executable_tdefilepicker.mk |1 - vcl/Executable_vcldemo.mk |1 - vcl/Library_vclplug_tde.mk |1 - 9 files changed, 9 deletions(-) New commits: commit 2847c520c3449d60dcd3f8b525fba006bc1d9e01 Author: Tor Lillqvist Date: Thu Mar 19 21:41:54 2015 +0200 There are no include files in solenv/inc Change-Id: I69f20c3632c0bee7a3189aaa5a96bd9fff2da222 diff --git a/svx/Executable_pixelctl.mk b/svx/Executable_pixelctl.mk index d019d0c..3140af4 100644 --- a/svx/Executable_pixelctl.mk +++ b/svx/Executable_pixelctl.mk @@ -21,7 +21,6 @@ $(eval $(call gb_Executable_set_include,pixelctl,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ -I$(SRCDIR)/svx/inc \ --I$(SRCDIR)/solenv/inc \ )) $(eval $(call gb_Executable_use_libraries,pixelctl,\ diff --git a/vcl/Executable_mtfdemo.mk b/vcl/Executable_mtfdemo.mk index c52980b..52af4a3 100644 --- a/vcl/Executable_mtfdemo.mk +++ b/vcl/Executable_mtfdemo.mk @@ -20,7 +20,6 @@ $(eval $(call gb_Executable_use_external,mtfdemo,boost_headers)) $(eval $(call gb_Executable_set_include,mtfdemo,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ --I$(SRCDIR)/solenv/inc \ )) $(eval $(call gb_Executable_use_libraries,mtfdemo,\ diff --git a/vcl/Executable_outdevgrind.mk b/vcl/Executable_outdevgrind.mk index f1a822f..7b60d5e 100644 --- a/vcl/Executable_outdevgrind.mk +++ b/vcl/Executable_outdevgrind.mk @@ -20,7 +20,6 @@ $(eval $(call gb_Executable_use_external,outdevgrind,boost_headers)) $(eval $(call gb_Executable_set_include,outdevgrind,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ --I$(SRCDIR)/solenv/inc \ )) $(eval $(call gb_Executable_use_libraries,outdevgrind,\ diff --git a/vcl/Executable_svdemo.mk b/vcl/Executable_svdemo.mk index 8937129..0a958a2 100644 --- a/vcl/Executable_svdemo.mk +++ b/vcl/Executable_svdemo.mk @@ -20,7 +20,6 @@ $(eval $(call gb_Executable_use_external,svdemo,boost_headers)) $(eval $(call gb_Executable_set_include,svdemo,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ --I$(SRCDIR)/solenv/inc \ )) $(eval $(call gb_Executable_use_libraries,svdemo,\ diff --git a/vcl/Executable_svpclient.mk b/vcl/Executable_svpclient.mk index 5f3ba57..9f92ec5 100644 --- a/vcl/Executable_svpclient.mk +++ b/vcl/Executable_svpclient.mk @@ -20,7 +20,6 @@ $(eval $(call gb_Executable_use_external,svpclient,boost_headers)) $(eval $(call gb_Executable_set_include,svpclient,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ --I$(SRCDIR)/solenv/inc \ )) $(eval $(call gb_Executable_use_libraries,svpclient,\ diff --git a/vcl/Executable_svptest.mk b/vcl/Executable_svptest.mk index 35c9806..c373aa6 100644 --- a/vcl/Executable_svptest.mk +++ b/vcl/Executable_svptest.mk @@ -20,7 +20,6 @@ $(eval $(call gb_Executable_use_external,svptest,boost_headers)) $(eval $(call gb_Executable_set_include,svptest,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ --I$(SRCDIR)/solenv/inc \ )) $(eval $(call gb_Executable_use_libraries,svptest,\ diff --git a/vcl/Executable_tdefilepicker.mk b/vcl/Executable_tdefilepicker.mk index 9811e6d..fcbf55f 100644 --- a/vcl/Executable_tdefilepicker.mk +++ b/vcl/Executable_tdefilepicker.mk @@ -18,7 +18,6 @@ $(eval $(call gb_Executable_add_defs,tdefilepicker,\ $(eval $(call gb_Executable_set_include,tdefilepicker,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ --I$(SRCDIR)/solenv/inc \ -I$(SRCDIR)/vcl/inc/unx/kde \ )) diff --git a/vcl/Executable_vcldemo.mk b/vcl/Executable_vcldemo.mk index da9d9e6..5fa49e6 100644 --- a/vcl/Executable_vcldemo.mk +++ b/vcl/Executable_vcldemo.mk @@ -20,7 +20,6 @@ $(eval $(call gb_Executable_use_external,vcldemo,boost_headers)) $(eval $(call gb_Executable_set_include,vcldemo,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ --I$(SRCDIR)/solenv/inc \ )) $(eval $(call gb_Executable_use_libraries,vcldemo,\ diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk index d05780b..af5da99d 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -14,7 +14,6 @@ $(eval $(call gb_Library_Library,vclplug_tde)) $(eval $(call gb_Library_set_include,vclplug_tde,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ --I$(SRCDIR)/solenv/inc \ -I$(SRCDIR)/vcl/inc/unx/kde \ -I$(SRCDIR)/include/shell \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/Library_tdeab1.mk connectivity/Library_tdeabdrv1.mk shell/Library_tdebe.mk vcl/Library_vclplug_tde.mk
connectivity/Library_tdeab1.mk|1 - connectivity/Library_tdeabdrv1.mk |1 - shell/Library_tdebe.mk|5 - vcl/Library_vclplug_tde.mk|1 - 4 files changed, 8 deletions(-) New commits: commit 3a699403f1c6d979fc61f4bc14e5c1f740c8aab0 Author: Tor Lillqvist Date: Thu Mar 19 21:54:24 2015 +0200 No need to use -I$(SRCDIR)/include/shell We always use -I$(SRCDIR)/include, and the #include statements use . Change-Id: I62d32b3a1bd0840f3a4bb149c5552c2aed98cb56 diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk index 8243280..298ed4c 100644 --- a/connectivity/Library_tdeab1.mk +++ b/connectivity/Library_tdeab1.mk @@ -18,7 +18,6 @@ $(eval $(call gb_Library_set_componentfile,tdeab1,connectivity/source/drivers/ka $(eval $(call gb_Library_set_include,tdeab1,\ -I$(SRCDIR)/connectivity/source/inc \ --I$(SRCDIR)/include/shell \ $$(INCLUDE) \ )) diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk index 1398d9f..8301e5f 100644 --- a/connectivity/Library_tdeabdrv1.mk +++ b/connectivity/Library_tdeabdrv1.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Library_Library,tdeabdrv1)) $(eval $(call gb_Library_set_include,tdeabdrv1,\ -I$(SRCDIR)/connectivity/source/inc \ - -I$(SRCDIR)/include/shell \ $$(INCLUDE) \ -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) diff --git a/shell/Library_tdebe.mk b/shell/Library_tdebe.mk index 3b516d8..dc5b735 100644 --- a/shell/Library_tdebe.mk +++ b/shell/Library_tdebe.mk @@ -9,11 +9,6 @@ $(eval $(call gb_Library_Library,tdebe1)) -$(eval $(call gb_Library_set_include,tdebe1,\ -$$(INCLUDE) \ --I$(SRCDIR)/include/shell \ -)) - $(eval $(call gb_Library_use_sdk_api,tdebe1)) $(eval $(call gb_Library_use_externals,tdebe1,\ diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk index af5da99d..ad1ed40 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -15,7 +15,6 @@ $(eval $(call gb_Library_set_include,vclplug_tde,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ -I$(SRCDIR)/vcl/inc/unx/kde \ --I$(SRCDIR)/include/shell \ )) $(eval $(call gb_Library_set_include,vclplug_tde,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: New Defects reported by Coverity Scan for LibreOffice
Hi, On Thu, Mar 19, 2015 at 05:09:54PM +, Caolán McNamara wrote: > caolanm->Bjoern: cid#1288896 > after b0dae8c4c57aa50bbff7b3fd4d84476636bf1677 Yes, thats me. Im refactoring the whole SwClient/SwModify mess and will take care of those cids. I have some more commits that I hope I can push tonight, with that it should be out of the roughest part. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Summer of Code (March 17,2015)
On Thu, 2015-03-19 at 18:12 +0100, Jan-Marek Glogowski wrote:
> Am 19.03.2015 um 10:20 schrieb Caolán McNamara:
> > On Wed, 2015-03-18 at 21:04 +0200, Efe Gürkan YALAMAN wrote:
> >>
> >> Somewhere in the bugzilla I think Caolan mentioned it can be
> >> implemented as a tree-view because the options are in a tree structure
> >> and it would fit better then a simple table. Also it solves the
> >> dialog's usability issues too. I hope that will solve the
> >> accessibility problems too.
> >
> > Yeah, I think that's the best approach, to try and use a tree in there.
> > (a SvTreeList I suppose) because the amount of elements in the list is
> > just crazy, 30,000+ IIRC. Ideally on-demand loaded, e.g. tree is
> > collapsed and just shows +com.sun.star, when you expand that, then only
> > then is the subtree inserted, and so on. So the full 30,000+ list isn't
> > actually in the widget, only the expanded portion.
>
> Not sure if it would be better - performance wise. I guess most people
> actually want to search and I'm not sure if it's better to rebuild the
> tree with partial data based on the search string.
FWIW, the basctl TreeListBox is an example of what I had in mind, see
the RequestingChildren and so forth there for something similar.
The last time I had a look at the a11y performance there is an insanely
slow a11y-caused iterate-over-the-whole-view to get to the right index
loop triggered by every insert into the model. I attach the experimental
patch of
http://lists.freedesktop.org/archives/libreoffice/2014-January/059081.htmlhttp://lists.freedesktop.org/archives/libreoffice/2014-January/059081.html
that highlights that hot-spot.
> Is the tree view able to filter the content, like the Gtk+ one allows
> via GtkTreeModelFilter?
I don't think so, well not on a quick look anyway, mostly seems that
SvTreeList is the GtkTreeModel-alike model and SvTreeListBox is the
GtkTreeView-alike view.
C.
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index adb759c..f01ff64 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -436,9 +436,20 @@ OUString SvTabListBox::GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const
SvTreeListEntry* SvTabListBox::GetEntryOnPos( sal_uLong _nEntryPos ) const
{
+static sal_uLong nCachedEntryPos;
+static sal_uLong nKnownStartIndex;
+static sal_uLong nKnownStartPos;
+
SvTreeListEntry* pEntry = NULL;
-sal_uLong i, nPos = 0, nCount = GetLevelChildCount( NULL );
-for ( i = 0; i < nCount; ++i )
+sal_uLong i = 0, nPos = 0, nCount = GetLevelChildCount( NULL );
+
+if (_nEntryPos >= nCachedEntryPos)
+{
+i = nKnownStartIndex;
+nPos = nKnownStartPos;
+}
+
+while (i < nCount)
{
SvTreeListEntry* pParent = GetEntry(i);
if ( nPos == _nEntryPos )
@@ -453,8 +464,12 @@ SvTreeListEntry* SvTabListBox::GetEntryOnPos( sal_uLong _nEntryPos ) const
if ( pEntry )
break;
}
+++i;
}
+nCachedEntryPos = _nEntryPos;
+nKnownStartIndex = i;
+nKnownStartPos = nPos;
return pEntry;
}
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - xmloff/source
xmloff/source/style/undlihdl.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 17f741678ea58841ba463465f22eeb6b83c40bc3
Author: Julien Nabet
Date: Sun Mar 8 21:32:39 2015 +0100
Related tdf#50133: Wrong underlining in Reports
By running some tests, I noticed double wave didn't appear when opening
report in non edit mode.
First you must know that to indicate "double wave", xml contains these 2
information:
style:text-underline-style="wave" style:text-underline-type="double"
The problem is the reading order of the parser doesn't seem the same each
time.
So if it reads style then type, it's ok thanks to this part:
132 case awt::FontUnderline::DOUBLE:
133 // A double line style has priority over a bold
line style,
134 // but not over the line style itself.
135 switch( eUnderline )
136 {
137 case awt::FontUnderline::SINGLE:
138 case awt::FontUnderline::BOLD:
139 break;
140 case awt::FontUnderline::WAVE:
141 case awt::FontUnderline::BOLDWAVE:
142 eNewUnderline = awt::FontUnderline::DOUBLEWAVE;
143 break;
but if the parser read type in the first place then style, the case
FontUnderline "DOUBLEWAVE" wasn't managed
Change-Id: Ie090507898e537827eebaae157dfac248baa43f1
Reviewed-on: https://gerrit.libreoffice.org/14801
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit 61a3ace9f42a37640b1ec18fad776ba7c1f61714)
Reviewed-on: https://gerrit.libreoffice.org/14914
diff --git a/xmloff/source/style/undlihdl.cxx b/xmloff/source/style/undlihdl.cxx
index 268d042..2832d11 100644
--- a/xmloff/source/style/undlihdl.cxx
+++ b/xmloff/source/style/undlihdl.cxx
@@ -233,7 +233,9 @@ bool XMLUnderlineStylePropHdl::importXML( const OUString&
rStrImpValue, uno::Any
eNewUnderline = awt::FontUnderline::BOLDDASHDOTDOT;
break;
case awt::FontUnderline::WAVE:
-if( awt::FontUnderline::BOLD == eUnderline )
+if( awt::FontUnderline::DOUBLE == eUnderline )
+eNewUnderline = awt::FontUnderline::DOUBLEWAVE;
+else if( awt::FontUnderline::BOLD == eUnderline )
eNewUnderline = awt::FontUnderline::BOLDWAVE;
break;
case awt::FontUnderline::SMALLWAVE:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sc/qa sfx2/source sw/source
sc/qa/unit/ucalc_pivottable.cxx |3 ++-
sfx2/source/dialog/tabdlg.cxx|2 +-
sw/source/core/txtnode/ndtxt.cxx |3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 4dce503b2777e589d713f0fca2604a9a7916813b
Author: Caolán McNamara
Date: Thu Mar 19 16:56:23 2015 +
coverity#1288895 Explicit null dereferenced
Change-Id: I3b8fe2e1aec18b41b1d4553bca0fa6c52d5cfde6
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index cdb6a1b..4cea451 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1355,7 +1355,7 @@ void SfxTabDialog::SetInputSet( const SfxItemSet* pInSet )
delete pSet;
pSet = pInSet ? new SfxItemSet(*pInSet) : 0;
-if ( !bSet && !pExampleSet && !pOutSet )
+if (!bSet && !pExampleSet && !pOutSet && pSet)
{
pExampleSet = new SfxItemSet( *pSet );
pOutSet = new SfxItemSet( *pSet->GetPool(), pSet->GetRanges() );
commit 3f6589a649cf6d411391409c3ed637e6b641ba80
Author: Caolán McNamara
Date: Thu Mar 19 16:53:22 2015 +
coverity#1288894 Dereference after null check, golden
regression from
commit 553a058ec877e5ea858dbc47eec456033a6323ab
Date: Sat Mar 14 20:43:43 2015 +0100
core: dont use 'shortcut' that is longer than the original
Change-Id: I0154e484a4f4d6ce6672ddf35d1869157a61f71e
Change-Id: I4159a5caf492900bcfb863bc0bc5cf59a47a311c
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 924c117..c630288 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -312,7 +312,8 @@ static void lcl_ChangeFtnRef( SwTxtNode &rNode )
{
if( !pFrm )
{
-if(!SwIterator( rNode ).First())
+pFrm = SwIterator(rNode).First();
+if (!pFrm)
return;
}
SwTxtFtn *pAttr = static_cast(pHt);
commit 19fd963db6684a69ac13101c056a135d1b96687b
Author: Caolán McNamara
Date: Thu Mar 19 16:49:48 2015 +
coverity#1209001 Unchecked return value
Change-Id: I1d2615ed478417a965ebddb37539ce4697b8e92f
diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx
index 07b04ca..932efd6 100644
--- a/sc/qa/unit/ucalc_pivottable.cxx
+++ b/sc/qa/unit/ucalc_pivottable.cxx
@@ -2166,7 +2166,8 @@ void Test::testFuncGETPIVOTDATA()
pDPObj = createDPFromRange(m_pDoc, aDataRange, aFields,
SAL_N_ELEMENTS(aFields), false);
}
-pDPs->InsertNewTable(pDPObj);
+bSuccess = pDPs->InsertNewTable(pDPObj);
+CPPUNIT_ASSERT_MESSAGE("InsertNewTable failed", bSuccess);
aOutRange = refresh(pDPObj);
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/Module_vcl.mk
vcl/Module_vcl.mk |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) New commits: commit 1b4025b58e01bcc3151d2b32ed4a3a99c7329245 Author: Kay Schenk Date: Thu Mar 19 21:37:55 2015 + #126118# Fix malformed if statements in makefile. diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 3779f68..6272197 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -38,17 +38,19 @@ $(eval $(call gb_Module_add_targets,vcl,\ Library_desktop_detector \ )) -ifneq ($(ENABLE_GTK),) + +ifeq ($(ENABLE_GTK),TRUE) $(eval $(call gb_Module_add_targets,vcl,\ Library_vclplug_gtk \ )) endif -ifneq ($(ENABLE_KDE),) + +ifeq ($(ENABLE_KDE),TRUE) $(eval $(call gb_Module_add_targets,vcl,\ Library_vclplug_kde \ )) endif -ifneq ($(ENABLE_KDE4),) +ifeq ($(ENABLE_KDE4),TRUE) $(eval $(call gb_Module_add_targets,vcl,\ Library_vclplug_kde4 \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f54bc1365de88efc82ddfee86f4a24bc132d8e9c Author: Andras Timar Date: Thu Mar 19 23:08:51 2015 +0100 Updated core Project: translations 6a11450be8a19648f3f76d7b9a098a9ef7c4d76e diff --git a/translations b/translations index add7a7e..6a11450 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit add7a7e0967a3fc04666ba061d81d1ba9b326554 +Subproject commit 6a11450be8a19648f3f76d7b9a098a9ef7c4d76e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: source/sl
source/sl/basctl/uiconfig/basicide/ui.po | 40 source/sl/cui/source/dialogs.po| 24 source/sl/cui/source/options.po| 45 source/sl/cui/uiconfig/ui.po | 516 +- source/sl/dbaccess/source/ui/dlg.po| 10 source/sl/dbaccess/uiconfig/ui.po | 359 - source/sl/desktop/uiconfig/ui.po |4 source/sl/extensions/source/bibliography.po| 10 source/sl/extensions/source/scanner.po | 254 - source/sl/extensions/uiconfig.po | 142 source/sl/filter/source/config/fragments/filters.po| 554 +- source/sl/filter/source/config/fragments/types.po | 29 source/sl/filter/source/pdf.po | 20 source/sl/filter/uiconfig/ui.po| 27 source/sl/formula/source/core/resource.po | 149 source/sl/fpicker/uiconfig/ui.po | 13 source/sl/framework/source/classes.po |4 source/sl/helpcontent2/source/text/sbasic/guide.po | 12 source/sl/helpcontent2/source/text/sbasic/shared/01.po | 20 source/sl/helpcontent2/source/text/scalc.po| 22 source/sl/helpcontent2/source/text/scalc/01.po | 2114 ++ source/sl/helpcontent2/source/text/scalc/04.po | 16 source/sl/helpcontent2/source/text/scalc/05.po | 254 + source/sl/helpcontent2/source/text/scalc/guide.po | 24 source/sl/helpcontent2/source/text/sdraw/guide.po |8 source/sl/helpcontent2/source/text/shared/00.po| 36 source/sl/helpcontent2/source/text/shared/01.po| 324 - source/sl/helpcontent2/source/text/shared/02.po| 36 source/sl/helpcontent2/source/text/shared/explorer/database.po | 14 source/sl/helpcontent2/source/text/shared/guide.po | 50 source/sl/helpcontent2/source/text/shared/optionen.po | 56 source/sl/helpcontent2/source/text/simpress/01.po | 72 source/sl/helpcontent2/source/text/simpress/04.po | 16 source/sl/helpcontent2/source/text/swriter.po | 20 source/sl/helpcontent2/source/text/swriter/01.po | 100 source/sl/helpcontent2/source/text/swriter/02.po | 48 source/sl/helpcontent2/source/text/swriter/04.po | 14 source/sl/helpcontent2/source/text/swriter/guide.po| 36 source/sl/helpcontent2/source/text/swriter/librelogo.po| 12 source/sl/officecfg/registry/data/org/openoffice/Office.po | 54 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po | 455 +- source/sl/sc/source/ui/StatisticsDialogs.po|4 source/sl/sc/source/ui/drawfunc.po | 28 source/sl/sc/source/ui/src.po | 861 +--- source/sl/sc/uiconfig/scalc/ui.po | 449 -- source/sl/scp2/source/accessories.po | 16 source/sl/scp2/source/impress.po | 22 source/sl/scp2/source/ooo.po | 44 source/sl/sd/source/core.po| 100 source/sl/sd/source/filter/html.po | 557 -- source/sl/sd/source/ui/app.po | 91 source/sl/sd/source/ui/dlg.po | 460 -- source/sl/sd/uiconfig/simpress/ui.po | 485 ++ source/sl/sfx2/source/dialog.po| 12 source/sl/sfx2/source/doc.po | 12 source/sl/sfx2/source/sidebar.po | 15 source/sl/sfx2/uiconfig/ui.po | 32 source/sl/starmath/source.po | 56 source/sl/starmath/uiconfig/smath/ui.po| 13 source/sl/svtools/uiconfig/ui.po | 115 source/sl/svx/source/dialog.po | 590 +- source/sl/svx/source/engine3d.po | 785 --- source/sl/svx/source/form.po | 12 source/sl/svx/source/gallery2.po | 12 source/sl/svx/source/sidebar/paragraph.po | 512 -- source/sl/svx/source/stbctrls.po |4 source/sl/svx/source/tbxctrls.po | 214 - source/sl/svx/uiconfig/ui.po | 1535 ++- source/sl/sw/source/ui/app.po
[Libreoffice-commits] core.git: 12 commits - sw/inc sw/source
sw/inc/calbck.hxx| 191 ++- sw/inc/switerator.hxx| 68 sw/source/core/access/accmap.cxx |2 sw/source/core/attr/calbck.cxx | 26 +-- sw/source/core/attr/cellatr.cxx |2 sw/source/core/crsr/annotationmark.cxx |2 sw/source/core/crsr/crstrvl.cxx |2 sw/source/core/doc/DocumentFieldsManager.cxx |2 sw/source/core/doc/DocumentStatisticsManager.cxx |2 sw/source/core/doc/doc.cxx |2 sw/source/core/doc/docdraw.cxx |2 sw/source/core/doc/docfld.cxx|2 sw/source/core/doc/docfly.cxx|2 sw/source/core/doc/docglbl.cxx |2 sw/source/core/doc/docnum.cxx|2 sw/source/core/doc/doctxm.cxx|2 sw/source/core/doc/fmtcol.cxx|2 sw/source/core/doc/htmltbl.cxx |2 sw/source/core/doc/tblrwcl.cxx |2 sw/source/core/docnode/ndtbl.cxx |2 sw/source/core/docnode/ndtbl1.cxx|2 sw/source/core/docnode/node.cxx |2 sw/source/core/docnode/node2lay.cxx |2 sw/source/core/docnode/section.cxx |2 sw/source/core/docnode/swbaslnk.cxx |2 sw/source/core/draw/dcontact.cxx |2 sw/source/core/edit/edfld.cxx|2 sw/source/core/edit/edfldexp.cxx |2 sw/source/core/edit/editsh.cxx |2 sw/source/core/fields/authfld.cxx|2 sw/source/core/fields/dbfld.cxx |2 sw/source/core/fields/ddefld.cxx |2 sw/source/core/fields/docufld.cxx|2 sw/source/core/fields/expfld.cxx |2 sw/source/core/fields/fldbas.cxx |2 sw/source/core/fields/fldlst.cxx |2 sw/source/core/fields/postithelper.cxx |2 sw/source/core/fields/reffld.cxx |2 sw/source/core/fields/tblcalc.cxx|2 sw/source/core/frmedt/feshview.cxx |2 sw/source/core/frmedt/tblsel.cxx |2 sw/source/core/layout/atrfrm.cxx |2 sw/source/core/layout/colfrm.cxx |2 sw/source/core/layout/findfrm.cxx|2 sw/source/core/layout/flowfrm.cxx|2 sw/source/core/layout/fly.cxx|2 sw/source/core/layout/flypos.cxx |2 sw/source/core/layout/frmtool.cxx|2 sw/source/core/layout/ftnfrm.cxx |2 sw/source/core/layout/movedfwdfrmsbyobjpos.cxx |2 sw/source/core/layout/pagechg.cxx|2 sw/source/core/layout/pagedesc.cxx |2 sw/source/core/layout/paintfrm.cxx |2 sw/source/core/layout/softpagebreak.cxx |2 sw/source/core/layout/tabfrm.cxx |2 sw/source/core/table/swnewtable.cxx |2 sw/source/core/table/swtable.cxx |2 sw/source/core/text/EnhancedPDFExportHelper.cxx |2 sw/source/core/text/itratr.cxx |2 sw/source/core/text/porlay.cxx |2 sw/source/core/text/txtdrop.cxx |2 sw/source/core/text/txtfrm.cxx |2 sw/source/core/tox/tox.cxx |2 sw/source/core/txtnode/atrflyin.cxx |2 sw/source/core/txtnode/atrftn.cxx|2 sw/source/core/txtnode/ndtxt.cxx |2 sw/source/core/undo/unattr.cxx |2 sw/source/core/undo/untbl.cxx|2 sw/source/core/unocore/unocoll.cxx |2 sw/source/core/unocore/unodraw.cxx |2 sw/source/core/unocore/unofield.cxx |2 sw/source/core/unocore/unoframe.cxx |2 sw/source/core/unocore/unoobj2.cxx |2 sw/source/core/unocore/unoportenum.cxx |2 sw/source/core/unocore/unoredlines.cxx |2 sw/source/core/unocore/unotbl.cxx|2 sw/source/core/view/vnew.cxx |2 sw/source/filter/ww8/ww8atr.cxx |2 sw/source/filter/xml/xmltexti.cxx|2 sw/source/ui/fldui/fldpage.cxx |2 sw/source/uibase/app/docsh.cxx |2 sw/source/uibase/dochdl/swdtflvr.cxx |2 sw/source/uibase/docvw/PostItMgr.cxx |2 sw/source/uibase/shells/textfld.cxx |2 sw/source/uibase/uno/unotxvw.cxx |2 85 files changed, 214 insertions(+
[Libreoffice-commits] core.git: canvas/source
canvas/source/cairo/cairo_textlayout.cxx | 43 +-
canvas/source/cairo/cairo_win32_cairo.cxx | 38 --
canvas/source/cairo/cairo_win32_cairo.hxx |2 -
3 files changed, 42 insertions(+), 41 deletions(-)
New commits:
commit b517c251a733692f39d02f986e5010f214aea697
Author: Caolán McNamara
Date: Thu Mar 19 15:59:56 2015 +
move ucs4toindex
Change-Id: I8ae441a68ba74422c607a8830325c3afa954ad92
Reviewed-on: https://gerrit.libreoffice.org/14908
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/canvas/source/cairo/cairo_textlayout.cxx
b/canvas/source/cairo/cairo_textlayout.cxx
index 9b1fa47..936593a 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -325,6 +325,47 @@ namespace cairocanvas
return true;
}
+#ifdef CAIRO_HAS_WIN32_SURFACE
+namespace
+{
+/**
+ * cairo::ucs4toindex: Convert ucs4 char to glyph index
+ * @param ucs4 an ucs4 char
+ * @param hfont current font
+ *
+ * @return true if successful
+ **/
+unsigned long ucs4toindex(unsigned int ucs4, HFONT hfont)
+{
+wchar_t unicode[2];
+WORD glyph_index;
+HDC hdc = NULL;
+
+hdc = CreateCompatibleDC (NULL);
+
+if (!hdc) return 0;
+if (!SetGraphicsMode (hdc, GM_ADVANCED))
+{
+DeleteDC (hdc);
+return 0;
+}
+
+SelectObject (hdc, hfont);
+SetMapMode (hdc, MM_TEXT);
+
+unicode[0] = ucs4;
+unicode[1] = 0;
+if (GetGlyphIndicesW (hdc, unicode, 1, &glyph_index, 0) ==
GDI_ERROR)
+{
+glyph_index = 0;
+}
+
+DeleteDC (hdc);
+return glyph_index;
+}
+}
+#endif
+
/**
* TextLayout::draw
*
@@ -446,7 +487,7 @@ namespace cairocanvas
#ifdef CAIRO_HAS_WIN32_SURFACE
// Cairo requires standard glyph indexes (ETO_GLYPH_INDEX),
while vcl/win/* uses ucs4 chars.
// Convert to standard indexes
-aGlyph.index = cairo::ucs4toindex((unsigned int) aGlyph.index,
rSysFontData.hFont);
+aGlyph.index = ucs4toindex((unsigned int) aGlyph.index,
rSysFontData.hFont);
#endif
aGlyph.x = systemGlyph.x;
aGlyph.y = systemGlyph.y;
diff --git a/canvas/source/cairo/cairo_win32_cairo.cxx
b/canvas/source/cairo/cairo_win32_cairo.cxx
index a54c7e1..d6a4aba 100644
--- a/canvas/source/cairo/cairo_win32_cairo.cxx
+++ b/canvas/source/cairo/cairo_win32_cairo.cxx
@@ -249,44 +249,6 @@ namespace cairo
return SurfaceSharedPtr();
}
-
-/**
- * cairo::ucs4toindex: Convert ucs4 char to glyph index
- * @param ucs4 an ucs4 char
- * @param hfont current font
- *
- * @return true if successful
- **/
-unsigned long ucs4toindex(unsigned int ucs4, HFONT hfont)
-{
-wchar_t unicode[2];
-WORD glyph_index;
-HDC hdc = NULL;
-
-hdc = CreateCompatibleDC (NULL);
-
-if (!hdc) return 0;
-if (!SetGraphicsMode (hdc, GM_ADVANCED))
-{
-DeleteDC (hdc);
-return 0;
-}
-
-SelectObject (hdc, hfont);
-SetMapMode (hdc, MM_TEXT);
-
-unicode[0] = ucs4;
-unicode[1] = 0;
-if (GetGlyphIndicesW (hdc, unicode, 1, &glyph_index, 0) == GDI_ERROR)
-{
-glyph_index = 0;
-}
-
-DeleteDC (hdc);
-return glyph_index;
-}
-
-
} // namespace cairo
#endif // CAIRO_HAS_WIN32_SURFACE
diff --git a/canvas/source/cairo/cairo_win32_cairo.hxx
b/canvas/source/cairo/cairo_win32_cairo.hxx
index 50bd137..6df30f5 100644
--- a/canvas/source/cairo/cairo_win32_cairo.hxx
+++ b/canvas/source/cairo/cairo_win32_cairo.hxx
@@ -49,8 +49,6 @@ namespace cairo {
int getDepth() const;
};
-
-unsigned long ucs4toindex(unsigned int ucs4, HFONT hfont);
}
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/misc/svxacorr.cxx | 108 +--
1 file changed, 59 insertions(+), 49 deletions(-)
New commits:
commit 307c25fe460857c52f0b9c2078e83f6d12f8bdc9
Author: Niklas Johansson
Date: Thu Mar 19 20:30:41 2015 +0100
tdf#89437 Ordinal suffix should never be superscript in some languages
Printing ordinal suffixes as superscript is just not done in Swedish and
likely a few other languages but this change only cares for Swedish at
the moment.
Change-Id: Ib7600ceb0534793d900f13b2740e63c1f7f34ba9
Reviewed-on: https://gerrit.libreoffice.org/14913
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 79868dd..e74ad5d 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -441,69 +441,79 @@ bool SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc,
const OUString& rTxt,
bool SvxAutoCorrect::FnChgOrdinalNumber(
-SvxAutoCorrDoc& rDoc, const OUString& rTxt,
-sal_Int32 nSttPos, sal_Int32 nEndPos,
-LanguageType eLang )
+SvxAutoCorrDoc& rDoc, const OUString& rTxt,
+sal_Int32 nSttPos, sal_Int32 nEndPos,
+LanguageType eLang)
{
-// 1st, 2nd, 3rd, 4 - 0th
-// 201th or 201st
-// 12th or 12nd
-CharClass& rCC = GetCharClass( eLang );
+// 1st, 2nd, 3rd, 4 - 0th
+// 201th or 201st
+// 12th or 12nd
bool bChg = false;
-for( ; nSttPos < nEndPos; ++nSttPos )
-if( !lcl_IsInAsciiArr( sImplSttSkipChars, rTxt[ nSttPos ] ))
-break;
-for( ; nSttPos < nEndPos; --nEndPos )
-if( !lcl_IsInAsciiArr( sImplEndSkipChars, rTxt[ nEndPos - 1 ] ))
-break;
+// In some languages ordinal suffixes should never be
+// changed to superscript. Let's break for those languages.
+switch (eLang)
+{
+case LANGUAGE_SWEDISH:
+case LANGUAGE_SWEDISH_FINLAND:
+break;
+default:
+CharClass& rCC = GetCharClass(eLang);
+for (; nSttPos < nEndPos; ++nSttPos)
+if (!lcl_IsInAsciiArr(sImplSttSkipChars, rTxt[nSttPos]))
+break;
+for (; nSttPos < nEndPos; --nEndPos)
+if (!lcl_IsInAsciiArr(sImplEndSkipChars, rTxt[nEndPos - 1]))
+break;
-// Get the last number in the string to check
-sal_Int32 nNumEnd = nEndPos;
-bool foundEnd = false;
-bool validNumber = true;
-sal_Int32 i = nEndPos;
-while ( i > nSttPos )
-{
-i--;
-bool isDigit = rCC.isDigit( rTxt, i );
-if ( foundEnd )
-validNumber |= isDigit;
+// Get the last number in the string to check
+sal_Int32 nNumEnd = nEndPos;
+bool foundEnd = false;
+bool validNumber = true;
+sal_Int32 i = nEndPos;
-if ( isDigit && !foundEnd )
+while (i > nSttPos)
{
-foundEnd = true;
-nNumEnd = i;
-}
-}
+i--;
+bool isDigit = rCC.isDigit(rTxt, i);
+if (foundEnd)
+validNumber |= isDigit;
-if ( foundEnd && validNumber ) {
-sal_Int32 nNum = rTxt.copy( nSttPos, nNumEnd - nSttPos + 1 ).toInt32(
);
+if (isDigit && !foundEnd)
+{
+foundEnd = true;
+nNumEnd = i;
+}
+}
-// Check if the characters after that number correspond to the ordinal
suffix
-uno::Reference< i18n::XOrdinalSuffix > xOrdSuffix
-= i18n::OrdinalSuffix::create(
comphelper::getProcessComponentContext() );
+if (foundEnd && validNumber) {
+sal_Int32 nNum = rTxt.copy(nSttPos, nNumEnd - nSttPos +
1).toInt32();
-uno::Sequence< OUString > aSuffixes = xOrdSuffix->getOrdinalSuffix(
nNum, rCC.getLanguageTag().getLocale( ) );
-for ( sal_Int32 nSuff = 0; nSuff < aSuffixes.getLength(); nSuff++ )
-{
-OUString sSuffix( aSuffixes[ nSuff ] );
-OUString sEnd = rTxt.copy( nNumEnd + 1, nEndPos - nNumEnd - 1 );
+// Check if the characters after that number correspond to the
ordinal suffix
+uno::Reference< i18n::XOrdinalSuffix > xOrdSuffix
+=
i18n::OrdinalSuffix::create(comphelper::getProcessComponentContext());
-if ( sSuffix == sEnd )
+uno::Sequence< OUString > aSuffixes =
xOrdSuffix->getOrdinalSuffix(nNum, rCC.getLanguageTag().getLocale());
+for (sal_Int32 nSuff = 0; nSuff < aSuffixes.getLength(); nSuff++)
{
-// Check if the ordinal suffix has to be set as super script
-if ( rCC.isLetter( sSuffix ) )
+OUString sSuffix(aSuffixes[nSuff]);
+OUString sEnd = rTxt.copy(nNumEnd + 1, nEndPos - nNumEnd - 1);
+
+if (sSuffix == sEnd)
Re: 4.4.3.0.0+ build fails (unit tests)
On Thu, Mar 19, 2015 at 9:01 AM, Miklos Vajna wrote: > Hi Justin, > > On Thu, Mar 19, 2015 at 04:32:35PM +0300, Justin Luth > wrote: >> P.S. I have not been able to figure out how to remove a file from a >> commit if I add it accidentally. If I do a "git commit -a" and get an >> unintended file, how do I amend the commit to "ignore" the file? (That >> is what happened here.) > > rm , then git commit -a --amend or git rm git commit --amend Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 7 commits - sw/inc sw/qa
sw/inc/calbck.hxx | 166 +++--
sw/qa/core/uwriter.cxx | 95
2 files changed, 176 insertions(+), 85 deletions(-)
New commits:
commit 85e969fc230a49ea40fd3a799bc5828d3e7c2e95
Author: Bjoern Michaelsen
Date: Fri Mar 20 02:07:00 2015 +0100
use IsChanged() some more
Change-Id: Ic32f27fe5aa6be115af0d3f28252b98c7b1788a3
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 062ebdf..2af23b7 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -317,7 +317,7 @@ public:
}
TElementType* Next()
{
-if( m_pPosition == m_pCurrent )
+if(!IsChanged())
m_pPosition = GetRightOfPos();
while(m_pPosition && !m_pPosition->IsA( TYPE(TElementType) ) )
m_pPosition = GetRightOfPos();
@@ -352,7 +352,7 @@ public:
}
SwClient* Next()
{
-if( m_pPosition == m_pCurrent )
+if(!IsChanged())
m_pPosition = GetRightOfPos();
return Sync();
}
commit 87bc662386ffe53b8b4b1fa07deb0bb665fe39c9
Author: Bjoern Michaelsen
Date: Thu Mar 19 03:23:24 2015 +0100
add unittest
Change-Id: Iba119145155ee13067565b1f314c85b0e6a8de85
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index e0860c8f..edfa241 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -60,6 +60,7 @@
#include "scriptinfo.hxx"
#include "IMark.hxx"
#include "ring.hxx"
+#include "calbck.hxx"
typedef tools::SvRef SwDocShellRef;
@@ -105,8 +106,10 @@ public:
void testTransliterate();
void testMarkMove();
void testIntrusiveRing();
+void testClientModify();
CPPUNIT_TEST_SUITE(SwDocTest);
+
CPPUNIT_TEST(testTransliterate);
CPPUNIT_TEST(randomTest);
CPPUNIT_TEST(testPageDescName);
@@ -134,6 +137,7 @@ public:
CPPUNIT_TEST(testGraphicAnchorDeletion);
CPPUNIT_TEST(testMarkMove);
CPPUNIT_TEST(testIntrusiveRing);
+CPPUNIT_TEST(testClientModify);
CPPUNIT_TEST_SUITE_END();
private:
@@ -1384,6 +1388,97 @@ void SwDocTest::testIntrusiveRing()
CPPUNIT_ASSERT_EQUAL(&foo, foo.GetPrev());
}
+namespace
+{
+struct TestModify : SwModify
+{
+TYPEINFO();
+};
+TYPEINIT1( TestModify, SwModify );
+struct TestClient : SwClient
+{
+TYPEINFO();
+int m_nModifyCount;
+TestClient() : m_nModifyCount(0) {};
+virtual void Modify( const SfxPoolItem*, const SfxPoolItem*)
+{
+ShowReg();
+++m_nModifyCount;
+}
+
+void ShowReg()
+{
+if(GetRegisteredIn())
+{
+std::cout << "TestClient " << this << " registered in " <<
GetRegisteredIn() << std::endl;
+}
+else
+std::cout << "TestClient " << this << " not registered " <<
std::endl;
+}
+};
+TYPEINIT1( TestClient, SwClient );
+struct OtherTestClient : SwClient
+{ TYPEINFO(); };
+TYPEINIT1( OtherTestClient, SwClient );
+}
+void SwDocTest::testClientModify()
+{
+TestModify aMod;
+TestClient aClient1, aClient2;
+aMod.Add(&aClient1);
+aMod.Add(&aClient2);
+
CPPUNIT_ASSERT_EQUAL(aClient1.GetRegisteredIn(),static_cast(&aMod));
+
CPPUNIT_ASSERT_EQUAL(aClient2.GetRegisteredIn(),static_cast(&aMod));
+aMod.ModifyBroadcast(nullptr, nullptr);
+CPPUNIT_ASSERT_EQUAL(aClient1.m_nModifyCount,1);
+CPPUNIT_ASSERT_EQUAL(aClient2.m_nModifyCount,1);
+aMod.ModifyBroadcast(nullptr, nullptr);
+CPPUNIT_ASSERT_EQUAL(aClient1.m_nModifyCount,2);
+CPPUNIT_ASSERT_EQUAL(aClient2.m_nModifyCount,2);
+CPPUNIT_ASSERT(!aClient1.IsA(TYPE(OtherTestClient)));
+{
+SwIterator aIter(aMod);
+for(OtherTestClient* pClient = aIter.First(); pClient ; pClient =
aIter.Next())
+CPPUNIT_ASSERT(false);
+}
+{
+int nCount = 0;
+SwIterator aIter(aMod);
+for(TestClient* pClient = aIter.First(); pClient ; pClient =
aIter.Next())
+{
+CPPUNIT_ASSERT_EQUAL(pClient->m_nModifyCount,2);
+++nCount;
+}
+CPPUNIT_ASSERT_EQUAL(nCount,2);
+}
+
CPPUNIT_ASSERT_EQUAL(aClient1.GetRegisteredIn(),static_cast(&aMod));
+
CPPUNIT_ASSERT_EQUAL(aClient2.GetRegisteredIn(),static_cast(&aMod));
+{
+int nCount = 0;
+SwIterator aIter(aMod);
+for(TestClient* pClient = aIter.First(); pClient ; pClient =
aIter.Next())
+{
+aMod.Remove(pClient);
+++nCount;
+}
+CPPUNIT_ASSERT_EQUAL(nCount,2);
+}
+CPPUNIT_ASSERT_EQUAL(aClient1.GetRegisteredIn(),
static_cast(nullptr));
+CPPUNIT_ASSERT_EQUAL(aClient2.GetRegisteredIn(),
static_cast(nullptr));
+{
+int nCount = 0;
+SwIterator aIter(aMod);
+for(TestClient* pClient = aIter.First(); pClient ; pClient =
aIter.Next())
+{
+CPPUNIT_ASSERT(false);
+
Laszlo Kis-Adam license statement
Hi there! According to the LibreOffice rules, I hereby state that all of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Cheers, Laszlo Kis-Adam ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] minutes of ESC call ...
On Thu, Mar 19, 2015 at 10:30 AM, Michael Meeks wrote: > > * Tinderbox functionality stats (Norbert) > + what %age of time is green for each platform ? Here are the precise stats for the past 2 weeks: Job name#-Successful#-Failed#-Total Builds-Failure Rate lo_gerrit_master-101-140-241-58.09% lo_gerrit_master/Gerrit=Gerrit,Platform=Linux-180-61-241-25.31% lo_gerrit_master/Gerrit=Gerrit,Platform=MacOSX-182-59-241-24.48% lo_gerrit_master/Gerrit=Gerrit,Platform=Windows-138-103-241-42.74% lo_tb_libreoffice-4-4_mac-23-6-29-20.69% lo_tb_master_linux-191-21-214-10.75% lo_tb_master_mac-169-35 204-17.16% lo_tb_master_win-114-47-161-29.19% Total: 1098-472-1572-30.15% ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/c83476ab28544c25ab72e7e51131ab481bcbcc5d/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: desktop/source
desktop/source/lib/init.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit a8c96af2bca17fcd031a245c52da314ab4902013 Author: David Tardon Date: Fri Mar 20 06:51:48 2015 +0100 drop unneeded include Change-Id: I566678d55fa5d052a94a9b69732e2be4c0c39280 diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index eff82b6..df4593f 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -51,7 +51,6 @@ #include #include -#include #if defined(UNX) && !defined(MACOSX) && !defined(ENABLE_HEADLESS) // Let's grab the SvpSalInstance and SvpSalVirtualDevice ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Gerrit News for core on 2015-03-20
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + tdf#42897 Warn the user if string without quote is entered as condition v in https://gerrit.libreoffice.org/14916 from Laszlo Kis-Adam about module sc + tdf#64575 Photo Album: Better Image Layout in https://gerrit.libreoffice.org/14912 from Enes Ateş about module sd + tdf#57174 Opening Any Dialog the First Value in the Dialog Should be Sele in https://gerrit.libreoffice.org/14881 from Qiwen Gao about module include, sc, vcl + tdf#89756 Switched postfix to prefix operator++/-- in https://gerrit.libreoffice.org/14903 from Gülşah Köse about module include, sc, sd, svtools, sw, vcl, xmloff + tdf#89405 DOC export: fix corrupted comment order in https://gerrit.libreoffice.org/14841 from Piet van Oostrum about module sw End of freshness + move cairo helpers to vcl and make per-plug in https://gerrit.libreoffice.org/14907 from Caolán McNamara about module canvas, include, vcl + Adjustable hidden content removal in e-mails in https://gerrit.libreoffice.org/14909 from Stefan Heinemann about module cui, officecfg, sw + tdf#89666: vcl: speed up HbLayoutEngine with cache in SwTxtFormatInfo in https://gerrit.libreoffice.org/14732 from Michael Stahl about module include, sw, vcl + tdf#30716 Engineering notation in https://gerrit.libreoffice.org/14886 from Laurent BP about module basic, svl + tdf#30716 start Engineering notation: implement exponent-interval in https://gerrit.libreoffice.org/14875 from Laurent BP about module include, xmloff + tdf#60060: DOCX export of section protection in https://gerrit.libreoffice.org/14895 from Eilidh McAdam about module sw * Merged changes on master for project core changed in the last 25 hours: + tdf#89437 Ordinal suffix should never be superscript in some languages in https://gerrit.libreoffice.org/14913 from Niklas Johansson + move ucs4toindex in https://gerrit.libreoffice.org/14908 from Caolán McNamara + reorganize resizing surfaces logic in https://gerrit.libreoffice.org/14902 from Caolán McNamara + tdf#90090 - rearrange Draw's UI by moving around its toolbars in https://gerrit.libreoffice.org/14904 from Yousuf Philips + loplugin:constantfunction: unotools in https://gerrit.libreoffice.org/14590 from Noel Grandin + loplugin:constantfunction: vcl in https://gerrit.libreoffice.org/14712 from Noel Grandin + loplugin:constantfunction: sfx2 in https://gerrit.libreoffice.org/14713 from Noel Grandin + loplugin:constantfunction: svtools in https://gerrit.libreoffice.org/14727 from Noel Grandin + loplugin:constantfunction: sot in https://gerrit.libreoffice.org/14728 from Noel Grandin + loplugin:constantfunction: tools in https://gerrit.libreoffice.org/14729 from Noel Grandin + loplugin:constantfunction: registry in https://gerrit.libreoffice.org/14730 from Noel Grandin + Related tdf#50133: Wrong underlining in Reports in https://gerrit.libreoffice.org/14801 from Julien Nabet + loplugin:constantfunction: svl in https://gerrit.libreoffice.org/14731 from Noel Grandin + loplugin:constantfunction: svx in https://gerrit.libreoffice.org/14759 from Noel Grandin + Optimize 'Breeze' icon theme in https://gerrit.libreoffice.org/14900 from Andrew Dent + loplugin:constantfunction: linguistic in https://gerrit.libreoffice.org/14760 from Noel Grandin + Percentages should also be translatable… in https://gerrit.libreoffice.org/14767 from Adolfo Jayme Barrientos + Support "a/b" style of fractions, not just "a b/c" style. Also fixes a cr in https://gerrit.libreoffice.org/14842 from Laszlo Kis-Adam + CppCheck cleaning : unnecessary assignment in https://gerrit.libreoffice.org/14856 from Michaël Lefèvre + Speed up ScriptRun::getPairIndex in https://gerrit.libreoffice.org/14834 from Noel Grandin + tdf#86787: Page style margin limited to 99.99mm in https://gerrit.libreoffice.org/14821 from Rishabh Kumar + CppCheck cleaning : scope reduction and printf format in https://gerrit.libreoffice.org/14854 from Michaël Lefèvre + loplugin:constantfunction: editeng in https://gerrit.libreoffice.org/14763 from Noel Grandin + loplugin:constantfunction: canvas in https://gerrit.libreoffice.org/14762 from Noel Grandin + loplugin:constantfunction: oox in https://gerrit.libreoffice.org/14761 from Noel Grandin * Abandoned changes on master for project core changed in the last 25 hours: + Fix build... in https://gerrit.libreoffice.org/14917 from Laszlo Kis-Adam + Adjustable hidden content removal in e-mails in https://gerrit.libreoffice.org/14889 from Stefan Heinemann * Open changes needing tweaks, but being untouched for more than a week: + tdf#88290: bring numbering back to 8 entries, ZH_CN locale, tdf#87626 rel in https://gerrit.libreoffice.org/14836 from Jingtao Yan + xmloff: convert xof.component to use constructor syntax in https://gerrit.libreoffice.org/14820 from Chr
[Libreoffice-commits] core.git: sd/source
sd/source/ui/dlg/tabtempl.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 3640717c8153e8b8e212e3aaa505007f7b8b0430
Author: Zolnai Tamás
Date: Fri Mar 20 07:21:27 2015 +0100
coverity#1288897 Resource leak
Here pRet was used to change the input set, so
use SetInputSet to get the same result.
Plus rename pRet since it's not a return value
any more.
Change-Id: I9e75abe2a86b372beb6fe5bd211dcf4fbbefb3da
diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx
index a213c38..e2e7613 100644
--- a/sd/source/ui/dlg/tabtempl.cxx
+++ b/sd/source/ui/dlg/tabtempl.cxx
@@ -174,15 +174,15 @@ void SdTabTemplateDlg::PageCreated( sal_uInt16 nId,
SfxTabPage &rPage )
void SdTabTemplateDlg::RefreshInputSet()
{
-SfxItemSet* pRet = GetInputSetImpl();
+SfxItemSet* pInputSet = GetInputSetImpl();
-if( pRet )
+if( pInputSet )
{
-pRet->ClearItem();
-pRet->SetParent( GetStyleSheet().GetItemSet().GetParent() );
+pInputSet->ClearItem();
+pInputSet->SetParent( GetStyleSheet().GetItemSet().GetParent() );
}
else
-pRet = new SfxItemSet( GetStyleSheet().GetItemSet() );
+SetInputSet(&GetStyleSheet().GetItemSet());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/xeroot.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2d279bc7d96b26c0721605cc98bd8e07bd03b707 Author: Julien Nabet Date: Fri Mar 20 07:35:42 2015 +0100 Typo: intead->instead Change-Id: I6aff104fa5749217d5c9628b5dfbfd3ac79bdc43 diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index 96f5085..876ed65 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -216,7 +216,7 @@ void XclExpRoot::InitializeGlobals() ScDocument& rDoc = GetDoc(); // Pass the model factory to OpCodeProvider, not the process // service factory, otherwise a FormulaOpCodeMapperObj would be -// instantiated intead of a ScFormulaOpCodeMapperObj and the +// instantiated instead of a ScFormulaOpCodeMapperObj and the // ScCompiler virtuals not be called! Which would be the case with // the current (2013-01-24) rDoc.GetServiceManager() const SfxObjectShell* pShell = rDoc.GetDocumentShell(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: New Defects reported by Coverity Scan for LibreOffice
> caolanm->Tamás: cid#1288897 > after f7424ed710e54bb2437a28380b03ed7c26290edc > SdTabTemplateDlg::GetRefreshedSet->SdTabTemplateDlg::RefreshInputSet has > a leaky "pRet = new SfxItemSet" in it now, what's the right fix there ? Thanks for the notification! It's fixed now. Tamás ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/svx opencl/source svtools/source svx/source winaccessibility/source
include/svx/svdmodel.hxx |2 - include/svx/unopool.hxx |2 - include/svx/unoshape.hxx | 28 +-- opencl/source/opencl_device.cxx |2 - svtools/source/uno/unoimap.cxx |4 +- svx/source/unodraw/shapeimpl.hxx |8 ++--- svx/source/unodraw/unoshape.cxx |2 - winaccessibility/source/UAccCOM/AccAction.cxx|2 - winaccessibility/source/UAccCOM/AccAction.h |4 +- winaccessibility/source/UAccCOM/AccActionBase.cxx|2 - winaccessibility/source/UAccCOM/AccActionBase.h |2 - winaccessibility/source/UAccCOM/AccComponent.cxx |2 - winaccessibility/source/UAccCOM/AccComponent.h |2 - winaccessibility/source/UAccCOM/AccComponentBase.cxx |2 - winaccessibility/source/UAccCOM/AccComponentBase.h |2 - winaccessibility/source/UAccCOM/AccEditableText.cxx |2 - winaccessibility/source/UAccCOM/AccEditableText.h|2 - winaccessibility/source/UAccCOM/AccHyperLink.h |4 +- winaccessibility/source/UAccCOM/AccHypertext.h |2 - winaccessibility/source/UAccCOM/AccImage.h |2 - winaccessibility/source/UAccCOM/AccRelation.h|2 - winaccessibility/source/UAccCOM/AccTable.cxx |2 - winaccessibility/source/UAccCOM/AccTable.h |2 - winaccessibility/source/UAccCOM/AccText.h|2 - winaccessibility/source/UAccCOM/AccTextBase.h|2 - winaccessibility/source/UAccCOM/AccValue.h |2 - 26 files changed, 45 insertions(+), 45 deletions(-) New commits: commit 62820766ef00c93192e0e8a7ce7c8f77f84a710e Author: Julien Nabet Date: Fri Mar 20 07:57:02 2015 +0100 Typo: (O/o)veride(n)->(O/o)verride(n) Change-Id: Ied81ede9aaf045866596adc40d357cbbddb3d704 diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index ddd7330..388e82e 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -579,7 +579,7 @@ public: void SetSdrUndoManager( SfxUndoManager* pUndoManager ); SfxUndoManager* GetSdrUndoManager() const; -/** applications can set their own undo factory to overide creation of +/** applications can set their own undo factory to override creation of undo actions. The SdrModel will become owner of the given SdrUndoFactory and delete it upon its destruction. */ void SetSdrUndoFactory( SdrUndoFactory* pUndoFactory ); diff --git a/include/svx/unopool.hxx b/include/svx/unopool.hxx index e7eaab1..1339199 100644 --- a/include/svx/unopool.hxx +++ b/include/svx/unopool.hxx @@ -51,7 +51,7 @@ public: */ virtual SfxItemPool* getModelPool( bool bReadOnly ) throw(); -// overiden helpers from comphelper::PropertySetHelper +// overriden helpers from comphelper::PropertySetHelper virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index de130b5..20f2e22 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -159,7 +159,7 @@ protected: void updateShapeKind(); void endSetPropertyValues(); -// overide these for special property handling in subcasses. Return true if property is handled +// override these for special property handling in subcasses. Return true if property is handled virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual bool getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::beans::PropertyState& rState ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); @@ -327,7 +3
