[Libreoffice-commits] core.git: vcl/README.vars

[Tor Lillqvist]

 vcl/README.vars |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bbb24a3bd818892ca435444b63ba0ab82e383b24
Author: Tor Lillqvist 
Date:   Wed Aug 19 09:30:26 2015 +0300

Add SAL_ENABLE_GLYPH_CACHING

Change-Id: I59dbfea2230012447732d12f732ad160a30908e7

diff --git a/vcl/README.vars b/vcl/README.vars
index d614843..2749d869 100644
--- a/vcl/README.vars
+++ b/vcl/README.vars
@@ -20,3 +20,4 @@ OpenGL
 --
 SAL_FORCEGL - force enable OpenGL
 SAL_WITHOUT_WIDGET_CACHE - disable LRU caching of native widget texutres
+SAL_ENABLE_GLYPH_CACHING - render glyphs to textures and use those, Windows 
only, WIP, broken
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - vcl/inc vcl/win

[Tor Lillqvist]

 vcl/inc/win/salgdi.h |1 
 vcl/win/source/gdi/winlayout.cxx |  347 +++
 vcl/win/source/gdi/winlayout.hxx |8 
 3 files changed, 355 insertions(+), 1 deletion(-)

New commits:
commit 239d4e0cbd7d0c4e3504528b8dcf5e10fbea9a0b
Author: Tor Lillqvist 
Date:   Wed Aug 19 09:18:37 2015 +0300

More hacks to glyph rendering for caching with OpenGL on Windows

Change-Id: I934ad7453f35909f4c3ad999e33453b5b6032480

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 0ab9cd9..7f4c4a4 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -160,7 +160,10 @@ inline std::basic_ostream & operator <<(
 stream << "{";
 for (auto i = rCache.cbegin(); i != rCache.cend(); ++i)
 {
-stream << "[" << i->mnFirstGlyph << ".." << (i->mnFirstGlyph + 
i->mnGlyphCount - 1) << "]";
+stream << "[" << i->mnFirstGlyph;
+if (i->mnGlyphCount > 1)
+stream << ".." << (i->mnFirstGlyph + i->mnGlyphCount - 1);
+stream << "]";
 if (i+1 != rCache.cend())
 {
 stream << ",";
@@ -278,10 +281,16 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, 
const WinLayout& rLayou
 int totWidth = 0;
 for (int i = 0; i < nCount; i++)
 {
-aDX[i] = std::abs(aABC[i].abcA) + aABC[i].abcB + 
std::abs(aABC[i].abcC);
+aDX[i] = aABC[i].abcB + std::abs(aABC[i].abcC);
+if (i == 0)
+aDX[0] += std::abs(aABC[0].abcA);
+if (i < nCount-1)
+aDX[i] += std::abs(aABC[i+1].abcA);
 totWidth += aDX[i];
 }
 
+SAL_INFO("vcl.gdi.opengl", "aSize=(" << aSize.cx << "," << aSize.cy << ") 
totWidth=" << totWidth);
+
 if (SelectObject(hDC, hOrigFont) == NULL)
 SAL_WARN("vcl.gdi", "SelectObject failed: " << 
WindowsErrorString(GetLastError()));
 if (!DeleteDC(hDC))
commit df42d08191fd76b38d58a317f9aca804e10df062
Author: Tor Lillqvist 
Date:   Tue Aug 18 13:43:27 2015 +0300

More hacking on OpenGL glyph caching on Windows

Now text looks better, for instance the lower-case "t" glyphs on the
Start Centre aren't totally weird any more. But for instance the tip
of the hook of "j" leaks into the "i" texture. I guess I really would
need to render glyphs one by one.

Change-Id: I69ae2d2f7c559530bcfdfc1a4915503fcb3ab4af

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index e32b8b5..0ab9cd9 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -204,7 +204,7 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, 
const WinLayout& rLayou
 if (nGlyphIndex == DROPPED_OUTGLYPH)
 return true;
 
-SAL_INFO("vcl.gdi.opengl", "AddChunkOfGlyphs " << this << " " << 
nGlyphIndex << " old: " << maOpenGLGlyphCache);
+SAL_INFO("vcl.gdi.opengl", "this=" << this << " " << nGlyphIndex << " old: 
" << maOpenGLGlyphCache);
 
 auto n = maOpenGLGlyphCache.begin();
 while (n != maOpenGLGlyphCache.end() &&
@@ -262,12 +262,32 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, 
const WinLayout& rLayou
 return false;
 }
 
+std::vector aABC(nCount);
+if (!GetCharABCWidthsI(hDC, 0, nCount, aGlyphIndices.data(), aABC.data()))
+{
+SAL_WARN("vcl.gdi", "GetCharABCWidthsI failed: " << 
WindowsErrorString(GetLastError()));
+return false;
+}
+
+for (int i = 0; i < nCount; i++)
+std::cerr << aABC[i].abcA << ":" << aABC[i].abcB << ":" << 
aABC[i].abcC << " ";
+std::cerr << std::endl;
+
+// Avoid kerning as we want to be able to use individual rectangles for 
each glyph
+std::vector aDX(nCount);
+int totWidth = 0;
+for (int i = 0; i < nCount; i++)
+{
+aDX[i] = std::abs(aABC[i].abcA) + aABC[i].abcB + 
std::abs(aABC[i].abcC);
+totWidth += aDX[i];
+}
+
 if (SelectObject(hDC, hOrigFont) == NULL)
 SAL_WARN("vcl.gdi", "SelectObject failed: " << 
WindowsErrorString(GetLastError()));
 if (!DeleteDC(hDC))
 SAL_WARN("vcl.gdi", "DeleteDC failed: " << 
WindowsErrorString(GetLastError()));
 
-OpenGLCompatibleDC aDC(rGraphics, 0, 0, aSize.cx, aSize.cy);
+OpenGLCompatibleDC aDC(rGraphics, 0, 0, totWidth, aSize.cy);
 
 hOrigFont = SelectFont(aDC.getCompatibleHDC(), rLayout.mhFont);
 if (hOrigFont == NULL)
@@ -279,21 +299,6 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, 
const WinLayout& rLayou
 SetTextColor(aDC.getCompatibleHDC(), RGB(0, 0, 0));
 SetBkColor(aDC.getCompatibleHDC(), RGB(255, 255, 255));
 
-std::vector aABC(nCount);
-if (!GetCharABCWidthsI(aDC.getCompatibleHDC(), 0, nCount, 
aGlyphIndices.data(), aABC.data()))
-{
-SAL_WARN("vcl.gdi", "GetCharABCWidthsI failed: " << 
WindowsErrorString(GetLastError()));
-return false;
-}
-
-for (int i = 0; i < nCount; i++)
-std::cerr << aABC[i].abcA << "

[Libreoffice-commits] core.git: Branch 'feature/fixes7' - vcl/win

[Tor Lillqvist]

 vcl/win/source/gdi/winlayout.cxx |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit e7542ae6b233a95999ad1b313054639819a3af66
Author: Tor Lillqvist 
Date:   Wed Aug 19 09:18:37 2015 +0300

More hacking on cached glyph rendering for OpenGL on Windows

Change-Id: I934ad7453f35909f4c3ad999e33453b5b6032480

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 0ab9cd9..7f4c4a4 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -160,7 +160,10 @@ inline std::basic_ostream & operator <<(
 stream << "{";
 for (auto i = rCache.cbegin(); i != rCache.cend(); ++i)
 {
-stream << "[" << i->mnFirstGlyph << ".." << (i->mnFirstGlyph + 
i->mnGlyphCount - 1) << "]";
+stream << "[" << i->mnFirstGlyph;
+if (i->mnGlyphCount > 1)
+stream << ".." << (i->mnFirstGlyph + i->mnGlyphCount - 1);
+stream << "]";
 if (i+1 != rCache.cend())
 {
 stream << ",";
@@ -278,10 +281,16 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, 
const WinLayout& rLayou
 int totWidth = 0;
 for (int i = 0; i < nCount; i++)
 {
-aDX[i] = std::abs(aABC[i].abcA) + aABC[i].abcB + 
std::abs(aABC[i].abcC);
+aDX[i] = aABC[i].abcB + std::abs(aABC[i].abcC);
+if (i == 0)
+aDX[0] += std::abs(aABC[0].abcA);
+if (i < nCount-1)
+aDX[i] += std::abs(aABC[i+1].abcA);
 totWidth += aDX[i];
 }
 
+SAL_INFO("vcl.gdi.opengl", "aSize=(" << aSize.cx << "," << aSize.cy << ") 
totWidth=" << totWidth);
+
 if (SelectObject(hDC, hOrigFont) == NULL)
 SAL_WARN("vcl.gdi", "SelectObject failed: " << 
WindowsErrorString(GetLastError()));
 if (!DeleteDC(hDC))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/README.vars

[Tomaž Vajngerl]

 vcl/README.vars |   22 ++
 1 file changed, 22 insertions(+)

New commits:
commit f47f0e34a8122546f5c2093df279b5b026b1acc8
Author: Tomaž Vajngerl 
Date:   Thu Aug 6 16:36:36 2015 +0900

document some env vars in VCL

Change-Id: I780e18b7afee470cff525904687746e163d30bdd

diff --git a/vcl/README.vars b/vcl/README.vars
new file mode 100644
index 000..d614843
--- /dev/null
+++ b/vcl/README.vars
@@ -0,0 +1,22 @@
+Environment variables in VCL:
+
+General
+---
+SAL_USE_VCLPLUGIN - use a VCL plugin
+SAL_NO_NWF - disable native widgets
+SAL_FORCEDPI - force a specific DPI (gtk & gtk3 plugins only)
+
+VCL_DOUBLEBUFFERING_AVOID_PAINT - don't paint the buffer, useful to see where 
we do direct painting
+VCL_DOUBLEBUFFERING_FORCE_ENABLE - enable double buffered painting
+
+VCL_HIDE_WINDOWS - don't draw windows
+
+Bitmap
+--
+VCL_NO_THREAD_SCALE - disable threaded bitmap scale
+EMF_PLUS_DISABLE - use EMF rendering and ignore EMF+ specifics
+
+OpenGL
+--
+SAL_FORCEGL - force enable OpenGL
+SAL_WITHOUT_WIDGET_CACHE - disable LRU caching of native widget texutres
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/vcl vcl/source

[Thorsten Behrens]

 include/vcl/salbtype.hxx  |   20 
 vcl/source/gdi/pdfwriter_impl.hxx |   47 --
 2 files changed, 1 insertion(+), 66 deletions(-)

New commits:
commit e0b0501452e6a72ba800ae9f536d766f8111ed78
Author: Thorsten Behrens 
Date:   Tue Aug 18 18:36:51 2015 +0200

vcl: kill 'special member functions' the compiler generates

No need to spell out otherwise auto-generated functions.

Change-Id: I1d2aec552df197f6656b0a495cef22696667dc4b
Reviewed-on: https://gerrit.libreoffice.org/17846
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index 673c285..9528ffa 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -105,7 +105,6 @@ private:
 public:
 
 inline  BitmapColor();
-inline  BitmapColor( const BitmapColor& rBitmapColor );
 inline  BitmapColor( sal_uInt8 cRed, sal_uInt8 cGreen, 
sal_uInt8 cBlue );
 inline  BitmapColor( const Color& rColor );
 explicit inline BitmapColor( sal_uInt8 cIndex );
@@ -114,7 +113,6 @@ public:
 
 inline bool operator==( const BitmapColor& rBitmapColor ) const;
 inline bool operator!=( const BitmapColor& rBitmapColor ) const;
-inline BitmapColor& operator=( const BitmapColor& rBitmapColor );
 
 inline bool IsIndex() const;
 
@@ -276,14 +274,6 @@ inline BitmapColor::BitmapColor( sal_uInt8 cRed, sal_uInt8 
cGreen, sal_uInt8 cBl
 {
 }
 
-inline BitmapColor::BitmapColor( const BitmapColor& rBitmapColor ) :
-mcBlueOrIndex   ( rBitmapColor.mcBlueOrIndex ),
-mcGreen ( rBitmapColor.mcGreen ),
-mcRed   ( rBitmapColor.mcRed ),
-mbIndex ( rBitmapColor.mbIndex )
-{
-}
-
 inline BitmapColor::BitmapColor( const Color& rColor ) :
 mcBlueOrIndex   ( rColor.GetBlue() ),
 mcGreen ( rColor.GetGreen() ),
@@ -312,16 +302,6 @@ inline bool BitmapColor::operator!=( const BitmapColor& 
rBitmapColor ) const
 return !( *this == rBitmapColor );
 }
 
-inline BitmapColor& BitmapColor::operator=( const BitmapColor& rBitmapColor )
-{
-mcBlueOrIndex = rBitmapColor.mcBlueOrIndex;
-mcGreen = rBitmapColor.mcGreen;
-mcRed = rBitmapColor.mcRed;
-mbIndex = rBitmapColor.mbIndex;
-
-return *this;
-}
-
 inline bool BitmapColor::IsIndex() const
 {
 return mbIndex;
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx 
b/vcl/source/gdi/pdfwriter_impl.hxx
index aa941d9..43081aa 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -182,15 +182,6 @@ public:
 
 BitmapID() : m_nSize( 0 ), m_nChecksum( 0 ), m_nMaskChecksum( 0 ) {}
 
-BitmapID& operator=( const BitmapID& rCopy )
-{
-m_aPixelSize= rCopy.m_aPixelSize;
-m_nSize = rCopy.m_nSize;
-m_nChecksum = rCopy.m_nChecksum;
-m_nMaskChecksum = rCopy.m_nMaskChecksum;
-return *this;
-}
-
 bool operator==( const BitmapID& rComp ) const
 {
 return (m_aPixelSize == rComp.m_aPixelSize &&
@@ -701,7 +692,7 @@ private:
 // graphics state
 struct GraphicsState
 {
-vcl::Font   m_aFont;
+vcl::Fontm_aFont;
 MapMode  m_aMapMode;
 Colorm_aLineColor;
 Colorm_aFillColor;
@@ -741,42 +732,6 @@ private:
 m_nFlags( PushFlags::ALL ),
 m_nUpdateFlags( 0x )
 {}
-GraphicsState( const GraphicsState& rState ) :
-m_aFont( rState.m_aFont ),
-m_aMapMode( rState.m_aMapMode ),
-m_aLineColor( rState.m_aLineColor ),
-m_aFillColor( rState.m_aFillColor ),
-m_aTextLineColor( rState.m_aTextLineColor ),
-m_aOverlineColor( rState.m_aOverlineColor ),
-m_aClipRegion( rState.m_aClipRegion ),
-m_bClipRegion( rState.m_bClipRegion ),
-m_nAntiAlias( rState.m_nAntiAlias ),
-m_nLayoutMode( rState.m_nLayoutMode ),
-m_aDigitLanguage( rState.m_aDigitLanguage ),
-m_nTransparentPercent( rState.m_nTransparentPercent ),
-m_nFlags( rState.m_nFlags ),
-m_nUpdateFlags( rState.m_nUpdateFlags )
-{
-}
-
-GraphicsState& operator=(const GraphicsState& rState )
-{
-m_aFont = rState.m_aFont;
-m_aMapMode  = rState.m_aMapMode;
-m_aLineColor= rState.m_aLineColor;
-m_aFillColor= rState.m_aFillColor;
-m_aTextLineColor= rState.m_aTextLineColor;
-m_a

[Libreoffice-commits] core.git: editeng/source i18nutil/Library_i18nutil.mk i18nutil/source include/unotools sfx2/source svtools/source svx/source sw/source unotools/source

[Caolán McNamara]

 editeng/source/editeng/editeng.cxx|   24 --
 editeng/source/editeng/impedit.hxx|4 +-
 editeng/source/editeng/impedit2.cxx   |4 ++
 editeng/source/items/numitem.cxx  |7 ++--
 i18nutil/Library_i18nutil.mk  |1 
 i18nutil/source/utility/paper.cxx |4 ++
 include/unotools/configmgr.hxx|6 +++
 sfx2/source/control/shell.cxx |6 ++-
 svtools/source/graphic/grfmgr.cxx |   28 +++-
 svx/source/svdraw/svdetc.cxx  |   15 ++--
 svx/source/svdraw/svdmodel.cxx|   16 +++--
 sw/source/core/bastyp/init.cxx|   16 +++--
 sw/source/core/doc/DocumentSettingManager.cxx |   44 ++
 sw/source/core/doc/docdesc.cxx|3 +
 sw/source/core/doc/number.cxx |4 ++
 sw/source/core/draw/drawdoc.cxx   |3 +
 sw/source/uibase/app/docsh2.cxx   |3 +
 sw/source/uibase/app/docshdrw.cxx |4 +-
 unotools/source/config/configitem.cxx |9 +++--
 unotools/source/config/configmgr.cxx  |   12 +++
 unotools/source/config/saveopt.cxx|   15 +++-
 unotools/source/config/viewoptions.cxx|3 +
 unotools/source/misc/syslocale.cxx|   12 ++-
 23 files changed, 186 insertions(+), 57 deletions(-)

New commits:
commit 6b7354ae66db40246a09e00aa876443057655a43
Author: Caolán McNamara 
Date:   Fri Jul 10 11:04:50 2015 +0100

for testing allow disabling configmgr for time critical paths

Change-Id: I08021f18d53e1748927f8847649994f95252bbc2
Reviewed-on: https://gerrit.libreoffice.org/17844
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index 910b487..ea3a5f9 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1294,18 +1294,24 @@ bool EditEngine::PostKeyEvent( const KeyEvent& 
rKeyEvent, EditView* pEditView, v
 LanguageType eLang = 
pImpEditEngine->GetLanguage( EditPaM( aStart.GetNode(), aStart.GetIndex()+1));
 LanguageTag aLanguageTag( eLang);
 
-if 
(!pImpEditEngine->xLocaleDataWrapper.isInitialized())
-pImpEditEngine->xLocaleDataWrapper.init( 
SvtSysLocale().GetLocaleData().getComponentContext(), aLanguageTag);
+if (!pImpEditEngine->pLocaleDataWrapper)
+pImpEditEngine->pLocaleDataWrapper = new 
OnDemandLocaleDataWrapper;
+
+if 
(!pImpEditEngine->pLocaleDataWrapper->isInitialized())
+pImpEditEngine->pLocaleDataWrapper->init( 
SvtSysLocale().GetLocaleData().getComponentContext(), aLanguageTag);
 else
-
pImpEditEngine->xLocaleDataWrapper.changeLocale( aLanguageTag);
+
pImpEditEngine->pLocaleDataWrapper->changeLocale( aLanguageTag);
+
+if (!pImpEditEngine->pTransliterationWrapper)
+pImpEditEngine->pTransliterationWrapper = 
new OnDemandTransliterationWrapper;
 
-if 
(!pImpEditEngine->xTransliterationWrapper.isInitialized())
-
pImpEditEngine->xTransliterationWrapper.init( 
SvtSysLocale().GetLocaleData().getComponentContext(), eLang, 
i18n::TransliterationModules_IGNORE_CASE);
+if 
(!pImpEditEngine->pTransliterationWrapper->isInitialized())
+
pImpEditEngine->pTransliterationWrapper->init( 
SvtSysLocale().GetLocaleData().getComponentContext(), eLang, 
i18n::TransliterationModules_IGNORE_CASE);
 else
-
pImpEditEngine->xTransliterationWrapper.changeLocale( eLang);
+
pImpEditEngine->pTransliterationWrapper->changeLocale( eLang);
 
-const ::utl::TransliterationWrapper* 
pTransliteration = pImpEditEngine->xTransliterationWrapper.get();
-Sequence< i18n::CalendarItem2 > xItem = 
pImpEditEngine->xLocaleDataWrapper->getDefaultCalendarDays();
+const ::utl::TransliterationWrapper* 
pTransliteration = pImpEditEngine->pTransliterationWrapper->get();
+Sequence< i18n::CalendarItem2 > xItem = 
pImpEditEngine->pLocaleDataWrapper->get()->getDefaultCalendarDays();
 sal_Int32 nCount = xItem.getLength();
 const i18n::CalendarItem2* pArr = 
xItem.getArray();
   

[Libreoffice-commits] core.git: Branch 'feature/fixes7' - vcl/source

[Ashod Nakashian]

 vcl/source/app/scheduler.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 88cf10987f903078930b6e5f301141f9e1cfce2d
Author: Ashod Nakashian 
Date:   Sun Jul 19 13:33:11 2015 -0400

tdf#92036 - Writer infinite spelling loop

The periodic timers fire when the current time exceeds the
start time + the period. However, without reseting the start
time, the timer would end up thinking it must fire immediatly.

By reseting the start time when firing, the timer will
only fire again when another period has expired, not immediatly.

Change-Id: Ibd0311b12a514bfd558c0bd6ef83df8c89fd8c7e
Reviewed-on: https://gerrit.libreoffice.org/17194
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index c3cea78..4cbeeb9 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -33,6 +33,9 @@ void ImplSchedulerData::Invoke()
 // prepare Scheduler Object for deletion after handling
 mpScheduler->SetDeletionFlags();
 
+// tdf#92036 Reset the period to avoid re-firing immediately.
+mpScheduler->mpSchedulerData->mnUpdateTime = tools::Time::GetSystemTicks();
+
 // invoke it
 mbInScheduler = true;
 mpScheduler->Invoke();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Fail to build on Windows 7 (32 bits)

[Michael Stahl]

On 18.08.2015 20:37, julien2412 wrote:
> $ find workdir/UnpackedTarball/nss -name nspr4.lib
> workdir/UnpackedTarball/nss/nspr/out/pr/src/nspr4.lib

> build.log   

so the relevant difference is that your nsinstall.py command has
"libnspr4.lib" while mine has "nspr4.lib".

... the name comes from this part of the makefile
workdir/UnpackedTarball/nss/nspr/config/rules.mk:

> ifdef MSC_VER
> IMPORT_LIBRARY  = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
> else
> IMPORT_LIBRARY  = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
> endif

for some reason you don't have MSC_VER set - which is very unusual for a
Windows build of LO...

i wonder if this stuff from your log has something to do with it?

> make[2]:
> expr: erreur de syntaxe
> expr: erreur de syntaxe
> expr: erreur de syntaxe
> checking build system type... i686-pc-cygwin
> checking host system type... i686-pc-cygwin
> checking target system type... i686-pc-cygwin
> checking for cl... cl
> ../configure: line 7133: test: : integer expression expected
> ../configure: line 7143: test: -ge: unary operator expected
> ../configure: line 7157: test: : integer expression expected
> ../configure: line 7186: test: : integer expression expected
> ../configure: line 7228: test: : integer expression expected
> ../configure: line 7289: test: : integer expression expected
> configure: creating ./config.status

i don't get these error messages.

line 7133 of workdir/UnpackedTarball/nss/nspr/configure:

> if test "$_CC_MAJOR_VERSION" -eq "14"; then

so clearly something is going wrong in configure with the detection of MSVC.

can you patch in an echo around the CC_VERSION=`"${CC}" ... line to see
what the value of $CC and $CC_VERSION is?

did you do any changes from before when (presumably) the build worked,
or is this broken since the NSS upgrade commit
6e7991dfd8c54a833f4a9795a0d57f4690e92e6b ?


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: loolwsd/bundled

[Henry Castro]

 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h |   62 +++-
 1 file changed, 38 insertions(+), 24 deletions(-)

New commits:
commit 38c40efbf3e80ce593f11562d955113165ee6e4b
Author: Henry Castro 
Date:   Tue Aug 18 17:31:58 2015 -0400

loolwsd: update LibreOfficeKitInit.h

lok: namespace and re-work various types & helper functions.
by Michael Meeks.

diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h 
b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
index 0445fdf..c2f3426 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -40,9 +40,9 @@ extern "C"
 #endif
 #define SEPARATOR '/'
 
-void *_dlopen(const char *pFN)
+void *lok_loadlib(const char *pFN)
 {
-return dlopen(pFN, RTLD_NOW
+return dlopen(pFN, RTLD_LAZY
 #if defined __clang__ && defined __linux__ \
 && defined ENABLE_RUNTIME_OPTIMIZATIONS
 #if !ENABLE_RUNTIME_OPTIMIZATIONS
@@ -52,17 +52,17 @@ extern "C"
   );
 }
 
-char *_dlerror(void)
+char *lok_dlerror(void)
 {
 return dlerror();
 }
 
-void *_dlsym(void *Hnd, const char *pName)
+void *lok_dlsym(void *Hnd, const char *pName)
 {
 return dlsym(Hnd, pName);
 }
 
-int _dlclose(void *Hnd)
+int lok_dlclose(void *Hnd)
 {
 return dlclose(Hnd);
 }
@@ -80,24 +80,24 @@ extern "C"
 #define SEPARATOR '\\'
 #define UNOPATH   "\\..\\URE\\bin"
 
-void *_dlopen(const char *pFN)
+void *lok_loadlib(const char *pFN)
 {
 return (void *) LoadLibrary(pFN);
 }
 
-char *_dlerror(void)
+char *lok_dlerror(void)
 {
 LPSTR buf = NULL;
 FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | 
FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), 0, 
reinterpret_cast(&buf), 0, NULL);
 return buf;
 }
 
-void *_dlsym(void *Hnd, const char *pName)
+void *lok_dlsym(void *Hnd, const char *pName)
 {
 return GetProcAddress((HINSTANCE) Hnd, pName);
 }
 
-int _dlclose(void *Hnd)
+int lok_dlclose(void *Hnd)
 {
 return FreeLibrary((HINSTANCE) Hnd);
 }
@@ -139,16 +139,12 @@ extern "C"
 }
 #endif
 
-typedef LibreOfficeKit *(HookFunction)( const char *install_path);
-
-typedef LibreOfficeKit *(HookFunction2)( const char *install_path, const char 
*user_profile_path );
-
-static LibreOfficeKit *lok_init_2( const char *install_path,  const char 
*user_profile_path )
+static void *lok_dlopen( const char *install_path, char ** _imp_lib )
 {
 char *imp_lib;
 void *dlhandle;
-HookFunction *pSym;
-HookFunction2 *pSym2;
+
+*_imp_lib = NULL;
 
 #if !(defined(__APPLE__) && defined(__arm__))
 size_t partial_length;
@@ -172,7 +168,7 @@ static LibreOfficeKit *lok_init_2( const char 
*install_path,  const char *user_p
 imp_lib[partial_length++] = SEPARATOR;
 strcpy(imp_lib + partial_length, TARGET_LIB);
 
-dlhandle = _dlopen(imp_lib);
+dlhandle = lok_loadlib(imp_lib);
 if (!dlhandle)
 {
 // If TARGET_LIB exists, and likely is a real library (not a
@@ -183,18 +179,18 @@ static LibreOfficeKit *lok_init_2( const char 
*install_path,  const char *user_p
 if (stat(imp_lib, &st) == 0 && st.st_size > 100)
 {
 fprintf(stderr, "failed to open library '%s': %s\n",
-imp_lib, _dlerror());
+imp_lib, lok_dlerror());
 free(imp_lib);
 return NULL;
 }
 
 strcpy(imp_lib + partial_length, TARGET_MERGED_LIB);
 
-dlhandle = _dlopen(imp_lib);
+dlhandle = lok_loadlib(imp_lib);
 if (!dlhandle)
 {
 fprintf(stderr, "failed to open library '%s': %s\n",
-imp_lib, _dlerror());
+imp_lib, lok_dlerror());
 free(imp_lib);
 return NULL;
 }
@@ -203,23 +199,41 @@ static LibreOfficeKit *lok_init_2( const char 
*install_path,  const char *user_p
 imp_lib = strdup("the app executable");
 dlhandle = RTLD_MAIN_ONLY;
 #endif
+*_imp_lib = imp_lib;
+return dlhandle;
+}
+
+typedef LibreOfficeKit *(LokHookFunction)( const char *install_path);
+
+typedef LibreOfficeKit *(LokHookFunction2)( const char *install_path, const 
char *user_profile_path );
+
+typedef int (LokHookPreInit)  ( const char *install_path, const 
char *user_profile_path );
+
+static LibreOfficeKit *lok_init_2( const char *install_path,  const char 
*user_profile_path )
+{
+char *imp_lib;
+void *dlhandle;
+LokHookFunction *pSym;
+LokHookFunction2 *pSym2;
+
+dlhandle = lok_dlopen(install_path, &imp_lib);
 
-pSym2 = (HookFunction2 *) _dlsym( dlhandle, "libreofficekit_hook_2" );
+pSym2 = (LokHookFunction2 *) lok_dlsym(dlhandle, "libreofficekit_hook_2");
 if (!pSym2)
 {
   

Re: need help to fetch stable LibreOffice 5.0 code

[Ashod Nakashian]

Hi Madhura,

Please see my response to the same question to Rachna on this list.

On Tue, Aug 18, 2015 at 7:11 AM, Madhura Ravindra Palsule 
wrote:

> Dear Sir/Madam,
>
> I am newbie to libre office compilation, I want to fetch the stable
> release branch of libre office. I am trying to build LibreOffice on
> windows.
> when I use  *git clone* , it fetches the latest updated branch.
> Kindly help me with the parameter that need to be used in order to fetch
> particular stable release source code (of LibreOffice 5.0)
>
> Thanks & Regards,
> Madhura
>
> ---
>
> [ C-DAC is on Social-Media too. Kindly follow us at:
> Facebook: https://www.facebook.com/CDACINDIA & Twitter: @cdacindia ]
>
> This e-mail is for the sole use of the intended recipient(s) and may
> contain confidential and privileged information. If you are not the
> intended recipient, please contact the sender by reply e-mail and destroy
> all copies and the original message. Any unauthorized review, use,
> disclosure, dissemination, forwarding, printing or copying of this email
> is strictly prohibited and appropriate legal action will be taken.
> ---
>
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: unable to get latest stable build source code from git repository

[Ashod Nakashian]

On Tue, Aug 18, 2015 at 2:20 AM, Rachna Goel  wrote:

> hi thre,
>
> I am struggling to get latest stable source code of libreoffice on winows.
> when I use *git clone* , it fetches the latest updated branch.
> Kindly help me with the parameter that need to be used in order to fetch
> stable release source code (of LibreOffice 5.0)
>
>
Hi Rachna,

Git clones the complete repository. You can't exclude or include certain
branches (unlike SVN or P4, for example).

What you need to do is, after cloning, checkout the branch you are
interested in. (Also, you can download a compressed copy of the git repo
from the website and then git pull to update, that might be faster.)

The command to checkout a branch is: git checkout 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

unable to get latest stable build source code from git repository

[Rachna Goel]

hi thre,

I am struggling to get latest stable source code of libreoffice on winows.
when I use git clone , it fetches the latest updated branch. 
Kindly help me with the parameter that need to be used in order to fetch stable 
release source code (of LibreOffice 5.0) 


Thanks
Rachna


 

---
[ C-DAC is on Social-Media too. Kindly follow us at:
Facebook: https://www.facebook.com/CDACINDIA & Twitter: @cdacindia ]

This e-mail is for the sole use of the intended recipient(s) and may
contain confidential and privileged information. If you are not the
intended recipient, please contact the sender by reply e-mail and destroy
all copies and the original message. Any unauthorized review, use,
disclosure, dissemination, forwarding, printing or copying of this email
is strictly prohibited and appropriate legal action will be taken.
---

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

need help to fetch stable LibreOffice 5.0 code

[Madhura Ravindra Palsule]

Dear Sir/Madam,

I am newbie to libre office compilation, I want to fetch the stable release
branch of libre office. I am trying to build LibreOffice on windows.
when I use  git clone , it fetches the latest updated branch.
Kindly help me with the parameter that need to be used in order to fetch
particular stable release source code (of LibreOffice 5.0)

Thanks & Regards,
Madhura
---
[ C-DAC is on Social-Media too. Kindly follow us at:
Facebook: https://www.facebook.com/CDACINDIA & Twitter: @cdacindia ]

This e-mail is for the sole use of the intended recipient(s) and may
contain confidential and privileged information. If you are not the
intended recipient, please contact the sender by reply e-mail and destroy
all copies and the original message. Any unauthorized review, use,
disclosure, dissemination, forwarding, printing or copying of this email
is strictly prohibited and appropriate legal action will be taken.
---

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: Branch 'private/hcvcastro/forking' - loolwsd/LOOLBroker.cpp

[Henry Castro]

 loolwsd/LOOLBroker.cpp |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e070ffc8e45032f8e941ddf6ccc0b37bc201a44c
Author: Henry Castro 
Date:   Tue Aug 18 16:56:05 2015 -0400

loolwsd: add preinit parameters

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 21bed65..8930883 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -49,6 +49,8 @@
 #define LIB_SWLO"lib" "swlo" ".so"
 #define LIB_SDLO"lib" "sdlo" ".so"
 
+typedef int (LokHookPreInit)  ( const char *install_path, const char 
*user_profile_path );
+
 using Poco::Path;
 using Poco::File;
 using Poco::ThreadLocal;
@@ -223,6 +225,7 @@ static std::map 
_childProcesses;
 static bool globalPreinit(const std::string &loSubPath)
 {
 void *handle;
+LokHookPreInit* preInit;
 
 std::string fname = "/" + loSubPath + "/program/" LIB_SOFFICEAPP;
 handle = dlopen(fname.c_str(), RTLD_GLOBAL|RTLD_NOW);
@@ -232,17 +235,14 @@ static bool globalPreinit(const std::string &loSubPath)
 return false;
 }
 
-typedef int (*PreInitFn) (void);
-PreInitFn preInit;
-
-preInit = (PreInitFn)dlsym(handle, "lok_preinit");
+preInit = (LokHookPreInit *)dlsym(handle, "lok_preinit");
 if (!preInit)
 {
 std::cout << Util::logPrefix() << " Failed to find lok_preinit hook in 
library :" << LIB_SOFFICEAPP << std::endl;
 return false;
 }
 
-return preInit() == 0;
+return preInit(("/" + loSubPath + "/program").c_str(), "file:///user") == 
0;
 }
 
 static int createLibreOfficeKit(bool sharePages, std::string loSubPath, 
Poco::UInt64 childID)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/qa

[Varun]

 sw/qa/extras/odfimport/data/tdf74524.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx |   25 +
 2 files changed, 25 insertions(+)

New commits:
commit 5120b3f30614f6e4988c512577da1d70be8d25b1
Author: Varun 
Date:   Tue Aug 18 22:58:41 2015 +0530

Added Test for tdf#74524 ODF import of range annotation

Change-Id: I9e5d67026df1b3d79dda1158d35357a8dae47517
Reviewed-on: https://gerrit.libreoffice.org/17843
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/qa/extras/odfimport/data/tdf74524.odt 
b/sw/qa/extras/odfimport/data/tdf74524.odt
new file mode 100644
index 000..df6f2e8
Binary files /dev/null and b/sw/qa/extras/odfimport/data/tdf74524.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 4ed43af..708704d 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -19,6 +19,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -248,6 +249,30 @@ DECLARE_ODFIMPORT_TEST(testPageStyleLayoutDefault, 
"hello.odt")
 CPPUNIT_ASSERT_EQUAL(style::PageStyleLayout_ALL, 
getProperty(xPropertySet, "PageStyleLayout"));
 }
 
+DECLARE_ODFIMPORT_TEST(testTdf74524, "tdf74524.odt")
+{
+uno::Reference xTextFieldsSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xFieldsAccess(xTextFieldsSupplier->getTextFields());
+uno::Reference 
xFields(xFieldsAccess->createEnumeration());
+uno::Any aField1 = xFields->nextElement();
+uno::Reference xServiceInfo1(aField1, uno::UNO_QUERY);
+
CPPUNIT_ASSERT(xServiceInfo1->supportsService(OUString("com.sun.star.text.textfield.PageNumber")));
+uno::Reference xPropertySet(aField1, uno::UNO_QUERY);
+
CPPUNIT_ASSERT_EQUAL(uno::makeAny(sal_Int16(style::NumberingType::PAGE_DESCRIPTOR)),
 xPropertySet->getPropertyValue(OUString("NumberingType")));
+CPPUNIT_ASSERT_EQUAL(uno::makeAny(sal_Int16(0)), 
xPropertySet->getPropertyValue(OUString("Offset")));
+CPPUNIT_ASSERT_EQUAL(uno::makeAny(text::PageNumberType_CURRENT), 
xPropertySet->getPropertyValue(OUString("SubType")));
+uno::Reference xField1(aField1, uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("1"), xField1->getAnchor()->getString());
+uno::Any aField2 = xFields->nextElement();
+uno::Reference xServiceInfo2(aField2, uno::UNO_QUERY);
+
CPPUNIT_ASSERT(xServiceInfo2->supportsService(OUString("com.sun.star.text.textfield.Annotation")));
+uno::Reference xPropertySet2(aField2, uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Comment 1")), 
xPropertySet2->getPropertyValue(OUString("Content")));
+uno::Reference xField2(aField2, uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Hello 1World"), 
xField2->getAnchor()->getString());
+CPPUNIT_ASSERT(!xFields->hasMoreElements());
+}
+
 DECLARE_ODFIMPORT_TEST(testPageStyleLayoutRight, "hello.odt")
 {
 uno::Reference 
xPropertySet(getStyles("PageStyles")->getByName("Default Style"), 
uno::UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Build WebDAV neon/serf: differences among the two

[Michael Stahl]

On 18.08.2015 18:03, Giuseppe Castagno wrote:
> Hi Michael,
> 
> On 08/18/2015 03:16 PM, Michael Stahl wrote:
>> On 13.08.2015 17:32, Giuseppe Castagno wrote:
>>> Starting from V. 1.3.0 serf uses scons build system, not configure/make.
>>
>> oh well there had to be a catch... i believe we don't have anything
>> with scons currently, so it remains to be seen if and how that will
>> support finding our bundled libraries instead of system libraries,
>> building on Windows with MSVC (and using debug runtimes with
>> --enable-dbgutil), cross-compiling for Android/iOS, etc.
> 
> to be able to compile serf-1.3.8 I rewrote the way it's built: 
> practically writing a make specific for Windows, in Linux I used scons 
> instead.
> 
> To use scons in Windows+cygwin+MSCV proved to be a nightmare.

i was afraid so :(

> In short reworking all this for LO can be a difficult task.
> 
> Michael, in Sept 30th, ESC [1], you asked why not curl instead of serf.
> 
> The reason you asked it's because is in the codebase, and it uses NSS, 
> right?
> Other reasons I don't know?

yes ... so basically one of the big problems i see with our (TDF) builds
is that they bundle 2 cryptographic libraries: OpenSSL and NSS.  both of
these have remarkably awful build systems, and remarkable number of
serious CVEs so need regular updating.

OpenSSL has the additional problem with its very badly designed and
volatile ABI that on Linux you basically have to link it statically to
prevent conflicts with system OpenSSL due to ELF global symbol
namespace, and that adds at least ~1.5 MB to every library that uses it;
currently there are 3 users neon, python ssl module and postgresql
(everything else uses NSS).

but ideally we should be bundling 0 crypto libraries, because another
problem with these is that they bundle their own database of trusted PKI
CA certificates.  i am of the opinion that we (TDF) don't currently have
the resources or qualification to assess which CAs should or should not
be trusted, and therefore we shouldn't bundle such databases at all - we
should defer to the operating system's CA databases instead, and thereby
also give the user an UI (built into the OS) where they can add or
remove trusted CAs (we don't have such UI for the bundled certificates
so they are effectively hard-coded).

i like curl a lot because it can actually use the OS native crypto
libraries and CA databases on Windows (/DUSE_WINDOWS_SSPI), Darwin
(--with-darwinssl) and Linux (--with-nss/--with-gnutls/--with-openssl);
since LO~4.2 we actually use these options on Windows and MacOSX and it
seems to work.

> Briefly searching in LO I found curl is used in cmis, where it does a 
> similar task as it would be requested in WebDAV.

yes and i believe ftp UCP and the online update also use curl.



___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: cui/source include/unotools sd/source sfx2/source svtools/source unotools/source

[Caolán McNamara]

 cui/source/dialogs/hldocntp.cxx   |2 +-
 cui/source/dialogs/hldoctp.cxx|2 +-
 include/unotools/localfilehelper.hxx  |1 -
 sd/source/filter/ppt/pptin.cxx|4 ++--
 sfx2/source/appl/linkmgr2.cxx |3 ++-
 svtools/source/control/inettbc.cxx|2 +-
 unotools/source/ucbhelper/localfilehelper.cxx |   10 --
 7 files changed, 7 insertions(+), 17 deletions(-)

New commits:
commit 28f3464a571a23a2c16bd0980e9021b95d011511
Author: Caolán McNamara 
Date:   Tue Aug 18 20:38:42 2015 +0100

ConvertSystemPathToURL->getFileURLFromSystemPath

Change-Id: I1c60c60f9b5318626f42e33091920a4404fb6d1c

diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 2cace41..4581dba 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -408,7 +408,7 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl)
 
 OUStringaStrURL;
 OUStringaTempStrURL( m_pCbbPath->GetText() );
-utl::LocalFileHelper::ConvertSystemPathToURL( aTempStrURL, aStrURL );
+osl::FileBase::getFileURLFromSystemPath( aTempStrURL, aStrURL );
 
 OUStringaStrPath = aStrURL;
 boolbZeroPath = aStrPath.isEmpty();
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index a7087f3..2943637 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -127,7 +127,7 @@ OUString SvxHyperlinkDocTp::GetCurrentURL ()
 if ( aURL.GetProtocol() != INetProtocol::NotValid )// maybe the 
path is already a valid
 aStrURL = aStrPath; // hyperlink, then 
we can use this path directly
 else
-utl::LocalFileHelper::ConvertSystemPathToURL( aStrPath, aStrURL );
+osl::FileBase::getFileURLFromSystemPath( aStrPath, aStrURL );
 
 //#105788# always create a URL even if it is not valid
 if( aStrURL == aEmptyStr )
diff --git a/include/unotools/localfilehelper.hxx 
b/include/unotools/localfilehelper.hxx
index 809104d..8d93bf0 100644
--- a/include/unotools/localfilehelper.hxx
+++ b/include/unotools/localfilehelper.hxx
@@ -35,7 +35,6 @@ namespace utl
 Returning sal_True and an empty URL means that the URL doesn't point 
to a local file.
 */
 static bool ConvertPhysicalNameToURL(const OUString& rName, OUString& 
rReturn);
-static bool ConvertSystemPathToURL( const OUString& rName, OUString& 
rReturn );
 
 /**
 Converts a "UCB compatible" URL into a "physical" file name.
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 44c3668..735ac0f 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -18,7 +18,7 @@
  */
 
 #include 
-
+#include 
 #include 
 #include 
 #include 
@@ -2066,7 +2066,7 @@ void ImplSdPPTImport::FillSdAnimationInfo( 
SdAnimationInfo* pInfo, PptInteractiv
 OUString aBookmarkURL( pInfo->GetBookmark() );
 INetURLObject aURL( pPtr->aTarget );
 if( INetProtocol::NotValid == 
aURL.GetProtocol() )
-
utl::LocalFileHelper::ConvertSystemPathToURL( pPtr->aTarget, aBookmarkURL );
+osl::FileBase::getFileURLFromSystemPath( 
pPtr->aTarget, aBookmarkURL );
 if( aBookmarkURL.isEmpty() )
 aBookmarkURL = URIHelper::SmartRel2Abs( 
INetURLObject(aBaseURL), pPtr->aTarget, URIHelper::GetMaybeFileHdl(), true );
 pInfo->SetBookmark( aBookmarkURL );
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 432ac51..6a934f3 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -564,7 +565,7 @@ OUString lcl_DDE_RelToAbs( const OUString& rTopic, const 
OUString& rBaseURL )
 OUString sRet;
 INetURLObject aURL( rTopic );
 if( INetProtocol::NotValid == aURL.GetProtocol() )
-utl::LocalFileHelper::ConvertSystemPathToURL( rTopic, sRet );
+osl::FileBase::getFileURLFromSystemPath(rTopic, sRet);
 if( sRet.isEmpty() )
 sRet = URIHelper::SmartRel2Abs( INetURLObject(rBaseURL), rTopic, 
URIHelper::GetMaybeFileHdl(), true );
 return sRet;
diff --git a/svtools/source/control/inettbc.cxx 
b/svtools/source/control/inettbc.cxx
index 8d0a96f..dbff62a 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -538,7 +538,7 @@ OUString SvtURLBox::ParseSmart( const OUString& _aText, 
const OUString& _aBaseUR
 else
 {
 OUString aTmpMatch;
-::utl::LocalFileHelper::ConvertSystemPathToURL( aText, aTmpMatch );
+osl::FileBase::getFileURLFrom

[Libreoffice-commits] core.git: extras/source

[Khaled Hosny]

 extras/source/truetype/symbol/OpenSymbol.sfd |   14 +++---
 extras/source/truetype/symbol/opens___.ttf   |binary
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 75a8b1cf84ac718aa1c8d671cd27b0b10307f50a
Author: Khaled Hosny 
Date:   Tue Aug 18 02:35:35 2015 +0200

tdf#93302: Fix OpenSymbol %phi and %varphi glyphs

The glyphs for %phi and %varphi symbols were swapped in commit
81001f2c89e5932a8bfde26aacb9277b59146dff (back in 2009), as part of
https://bz.apache.org/ooo/show_bug.cgi?id=105084 (see the document
attached there), but no justification was given.

Given the shape of the symbols after that change contradicts the ones in
the Unicode code charts and other popular math fonts, I simply swapped
them back.

Change-Id: I0133a3d07df932f144ec5900103e11e27f174a5e
Reviewed-on: https://gerrit.libreoffice.org/17822
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/extras/source/truetype/symbol/OpenSymbol.sfd 
b/extras/source/truetype/symbol/OpenSymbol.sfd
index 463b8a1..ac5c8b1 100644
--- a/extras/source/truetype/symbol/OpenSymbol.sfd
+++ b/extras/source/truetype/symbol/OpenSymbol.sfd
@@ -3,8 +3,8 @@ FontName: OpenSymbol
 FullName: OpenSymbol
 FamilyName: OpenSymbol
 Weight: Book
-Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 
Julien Nabet\nPRECEDES <-> DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME <-> 
TRIPLE PRIME (c) 2013 Mathias Hasselmann
-Version: 102.6
+Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 
Julien Nabet\nPRECEDES <-> DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME <-> 
TRIPLE PRIME (c) 2013 Mathias Hasselmann\nphi <-> phi1 (c) 2015 Khaled Hosny
+Version: 102.7
 ItalicAngle: 0
 UnderlinePosition: -143
 UnderlineWidth: 20
@@ -773,7 +773,7 @@ ShortTable: maxp 16
   0
   0
 EndShort
-LangName: 1033 "" "" "Regular" "OpenSymbol" "" "Version 102.6" 
+LangName: 1033 "" "" "Regular" "OpenSymbol" 
 GaspTable: 1 65535 2 0
 Encoding: Custom
 UnicodeInterp: none
@@ -105039,8 +105039,8 @@ EndSplineSet
 Validated: 16385
 EndChar
 
-StartChar: phi
-Encoding: 954 966 954
+StartChar: phi1
+Encoding: 954 981 954
 Width: 1067
 Flags: W
 HStem: 892.524 48.4775<480.52 486.132 580.854 586.484>
@@ -105980,8 +105980,8 @@ EndSplineSet
 Validated: 16385
 EndChar
 
-StartChar: phi1
-Encoding: 960 981 960
+StartChar: phi
+Encoding: 960 966 960
 Width: 1235
 Flags: W
 HStem: -18.1895 52.1895<714 854.086> 869 62<321.383 492.494 803.829 998.555>
diff --git a/extras/source/truetype/symbol/opens___.ttf 
b/extras/source/truetype/symbol/opens___.ttf
index 51f2a4d..c739344 100644
Binary files a/extras/source/truetype/symbol/opens___.ttf and 
b/extras/source/truetype/symbol/opens___.ttf differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

[Ashod Nakashian]

 vcl/source/app/scheduler.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 032e251f0fb80bb2400804d13a2a954cdaedf605
Author: Ashod Nakashian 
Date:   Sun Jul 19 13:33:11 2015 -0400

tdf#92036 - Writer infinite spelling loop

The periodic timers fire when the current time exceeds the
start time + the period. However, without reseting the start
time, the timer would end up thinking it must fire immediatly.

By reseting the start time when firing, the timer will
only fire again when another period has expired, not immediatly.

Change-Id: Ibd0311b12a514bfd558c0bd6ef83df8c89fd8c7e
Reviewed-on: https://gerrit.libreoffice.org/17194
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index c3cea78..4cbeeb9 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -33,6 +33,9 @@ void ImplSchedulerData::Invoke()
 // prepare Scheduler Object for deletion after handling
 mpScheduler->SetDeletionFlags();
 
+// tdf#92036 Reset the period to avoid re-firing immediately.
+mpScheduler->mpSchedulerData->mnUpdateTime = tools::Time::GetSystemTicks();
+
 // invoke it
 mbInScheduler = true;
 mpScheduler->Invoke();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'private/hcvcastro/forking' - loolwsd/bundled

[Henry Castro]

 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h |   62 +++-
 1 file changed, 38 insertions(+), 24 deletions(-)

New commits:
commit 462787b294fd682ab8fa00dcab87c92414667667
Author: Henry Castro 
Date:   Tue Aug 18 15:29:42 2015 -0400

loolwsd: update LibreOfficeKitInit.h

lok: namespace and re-work various types & helper functions.
by Michael Meeks.

diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h 
b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
index 0445fdf..c2f3426 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -40,9 +40,9 @@ extern "C"
 #endif
 #define SEPARATOR '/'
 
-void *_dlopen(const char *pFN)
+void *lok_loadlib(const char *pFN)
 {
-return dlopen(pFN, RTLD_NOW
+return dlopen(pFN, RTLD_LAZY
 #if defined __clang__ && defined __linux__ \
 && defined ENABLE_RUNTIME_OPTIMIZATIONS
 #if !ENABLE_RUNTIME_OPTIMIZATIONS
@@ -52,17 +52,17 @@ extern "C"
   );
 }
 
-char *_dlerror(void)
+char *lok_dlerror(void)
 {
 return dlerror();
 }
 
-void *_dlsym(void *Hnd, const char *pName)
+void *lok_dlsym(void *Hnd, const char *pName)
 {
 return dlsym(Hnd, pName);
 }
 
-int _dlclose(void *Hnd)
+int lok_dlclose(void *Hnd)
 {
 return dlclose(Hnd);
 }
@@ -80,24 +80,24 @@ extern "C"
 #define SEPARATOR '\\'
 #define UNOPATH   "\\..\\URE\\bin"
 
-void *_dlopen(const char *pFN)
+void *lok_loadlib(const char *pFN)
 {
 return (void *) LoadLibrary(pFN);
 }
 
-char *_dlerror(void)
+char *lok_dlerror(void)
 {
 LPSTR buf = NULL;
 FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | 
FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), 0, 
reinterpret_cast(&buf), 0, NULL);
 return buf;
 }
 
-void *_dlsym(void *Hnd, const char *pName)
+void *lok_dlsym(void *Hnd, const char *pName)
 {
 return GetProcAddress((HINSTANCE) Hnd, pName);
 }
 
-int _dlclose(void *Hnd)
+int lok_dlclose(void *Hnd)
 {
 return FreeLibrary((HINSTANCE) Hnd);
 }
@@ -139,16 +139,12 @@ extern "C"
 }
 #endif
 
-typedef LibreOfficeKit *(HookFunction)( const char *install_path);
-
-typedef LibreOfficeKit *(HookFunction2)( const char *install_path, const char 
*user_profile_path );
-
-static LibreOfficeKit *lok_init_2( const char *install_path,  const char 
*user_profile_path )
+static void *lok_dlopen( const char *install_path, char ** _imp_lib )
 {
 char *imp_lib;
 void *dlhandle;
-HookFunction *pSym;
-HookFunction2 *pSym2;
+
+*_imp_lib = NULL;
 
 #if !(defined(__APPLE__) && defined(__arm__))
 size_t partial_length;
@@ -172,7 +168,7 @@ static LibreOfficeKit *lok_init_2( const char 
*install_path,  const char *user_p
 imp_lib[partial_length++] = SEPARATOR;
 strcpy(imp_lib + partial_length, TARGET_LIB);
 
-dlhandle = _dlopen(imp_lib);
+dlhandle = lok_loadlib(imp_lib);
 if (!dlhandle)
 {
 // If TARGET_LIB exists, and likely is a real library (not a
@@ -183,18 +179,18 @@ static LibreOfficeKit *lok_init_2( const char 
*install_path,  const char *user_p
 if (stat(imp_lib, &st) == 0 && st.st_size > 100)
 {
 fprintf(stderr, "failed to open library '%s': %s\n",
-imp_lib, _dlerror());
+imp_lib, lok_dlerror());
 free(imp_lib);
 return NULL;
 }
 
 strcpy(imp_lib + partial_length, TARGET_MERGED_LIB);
 
-dlhandle = _dlopen(imp_lib);
+dlhandle = lok_loadlib(imp_lib);
 if (!dlhandle)
 {
 fprintf(stderr, "failed to open library '%s': %s\n",
-imp_lib, _dlerror());
+imp_lib, lok_dlerror());
 free(imp_lib);
 return NULL;
 }
@@ -203,23 +199,41 @@ static LibreOfficeKit *lok_init_2( const char 
*install_path,  const char *user_p
 imp_lib = strdup("the app executable");
 dlhandle = RTLD_MAIN_ONLY;
 #endif
+*_imp_lib = imp_lib;
+return dlhandle;
+}
+
+typedef LibreOfficeKit *(LokHookFunction)( const char *install_path);
+
+typedef LibreOfficeKit *(LokHookFunction2)( const char *install_path, const 
char *user_profile_path );
+
+typedef int (LokHookPreInit)  ( const char *install_path, const 
char *user_profile_path );
+
+static LibreOfficeKit *lok_init_2( const char *install_path,  const char 
*user_profile_path )
+{
+char *imp_lib;
+void *dlhandle;
+LokHookFunction *pSym;
+LokHookFunction2 *pSym2;
+
+dlhandle = lok_dlopen(install_path, &imp_lib);
 
-pSym2 = (HookFunction2 *) _dlsym( dlhandle, "libreofficekit_hook_2" );
+pSym2 = (LokHookFunction2 *) lok_dlsym(dlhandle, "libreofficekit_hook_2");
 if (!pSym2)
 {
   

[Libreoffice-commits] core.git: cui/source fpicker/source include/unotools sfx2/source svtools/source svx/source unotools/source uui/source

[Caolán McNamara]

 cui/source/dialogs/hldocntp.cxx   |3 ++-
 cui/source/dialogs/hldoctp.cxx|3 ++-
 cui/source/dialogs/hltpbase.cxx   |3 ++-
 cui/source/dialogs/multipat.cxx   |9 +
 fpicker/source/office/iodlg.cxx   |   10 +-
 include/unotools/localfilehelper.hxx  |1 -
 sfx2/source/doc/printhelper.cxx   |4 ++--
 sfx2/source/inet/inettbc.cxx  |3 ++-
 svtools/source/control/inettbc.cxx|3 ++-
 svx/source/dialog/docrecovery.cxx |4 ++--
 unotools/source/ucbhelper/localfilehelper.cxx |   10 --
 uui/source/fltdlg.cxx |5 +++--
 12 files changed, 27 insertions(+), 31 deletions(-)

New commits:
commit 58d68a1bc9146334376206ae7ba8b1a6594a1040
Author: Caolán McNamara 
Date:   Tue Aug 18 17:11:09 2015 +0100

ConvertURLToSystemPath->getSystemPathFromFileURL

Change-Id: I7dc0e1b596f80b8f0870aed1722f711bb287ec0a

diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index d67771a..2cace41 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "hldocntp.hxx"
+#include 
 #include 
 #include 
 #include 
@@ -454,7 +455,7 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl)
 
 if( aNewURL.GetProtocol() == INetProtocol::File )
 {
-utl::LocalFileHelper::ConvertURLToSystemPath( aNewURL.GetMainURL( 
INetURLObject::NO_DECODE ), aStrTmp );
+osl::FileBase::getSystemPathFromFileURL(aNewURL.GetMainURL( 
INetURLObject::NO_DECODE ), aStrTmp);
 }
 else
 {
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 4e710cc..a7087f3 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "cuihyperdlg.hxx"
+#include 
 #include 
 #include 
 #include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
@@ -210,7 +211,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl)
 OUString aURL( aDlg.GetPath() );
 OUString aPath;
 
-utl::LocalFileHelper::ConvertURLToSystemPath( aURL, aPath );
+osl::FileBase::getSystemPathFromFileURL(aURL, aPath);
 
 m_pCbbPath->SetBaseURL( aURL );
 m_pCbbPath->SetText( aPath );
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index d7ed1a3..9764400 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 #include 
 #include 
@@ -483,7 +484,7 @@ OUString SvxHyperlinkTabPageBase::CreateUiNameFromURL( 
const OUString& aStrURL )
 switch(aURLObj.GetProtocol())
 {
 case INetProtocol::File:
-utl::LocalFileHelper::ConvertURLToSystemPath( 
aURLObj.GetMainURL(INetURLObject::NO_DECODE), aStrUiURL );
+
osl::FileBase::getSystemPathFromFileURL(aURLObj.GetMainURL(INetURLObject::NO_DECODE),
 aStrUiURL);
 break;
 case INetProtocol::Ftp :
 {
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index ba91c93..15e9a0b 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 #include 
 #include 
@@ -77,7 +78,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl)
 aPath.removeFinalSlash();
 OUString aURL = aPath.GetMainURL( INetURLObject::NO_DECODE );
 OUString sInsPath;
-::utl::LocalFileHelper::ConvertURLToSystemPath( aURL, sInsPath );
+osl::FileBase::getSystemPathFromFileURL(aURL, sInsPath);
 
 sal_uLong nPos = m_pRadioLB->GetEntryPos( sInsPath, 1 );
 if ( 0x == nPos ) //See svtools/source/contnr/svtabbx.cxx 
SvTabListBox::GetEntryPos
@@ -111,7 +112,7 @@ IMPL_LINK_NOARG(SvxPathSelectDialog, AddHdl_Impl)
 aPath.removeFinalSlash();
 OUString aURL = aPath.GetMainURL( INetURLObject::NO_DECODE );
 OUString sInsPath;
-::utl::LocalFileHelper::ConvertURLToSystemPath( aURL, sInsPath );
+osl::FileBase::getSystemPathFromFileURL(aURL, sInsPath);
 
 if ( LISTBOX_ENTRY_NOTFOUND != m_pPathLB->GetEntryPos( sInsPath ) )
 {
@@ -314,7 +315,7 @@ void SvxMultiPathDialog::SetPath( const OUString& rPath )
 OUString sPath = rPath.getToken( i, cDelim );
 OUString sSystemPath;
 bool bIsSystemPath =
-::utl::LocalFileHelper::ConvertURLToSystemPath( sPath, sSystemPath 
);
+osl::FileBase::getSystemPathFromFileURL(sPath, sSystemPath) == 
osl::FileBase::E_None;
 
 OUString sEntry( '\t' );
 sEntry += (bIsSystemPath ? sSystemPath : OUString(sPath));
@@ -346,7 +347,7 @@ void SvxPathSelectDialog::SetPath

[Libreoffice-commits] online.git: Branch 'private/hcvcastro/forking' - loolwsd/LOOLBroker.cpp

[Henry Castro]

 loolwsd/LOOLBroker.cpp |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 1a975e60a5e9c953e2b66891527738cd70d23a24
Author: Henry Castro 
Date:   Tue Aug 18 14:38:59 2015 -0400

loolwsd: remove fixme comment.

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 8d22f11..21bed65 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -235,7 +235,6 @@ static bool globalPreinit(const std::string &loSubPath)
 typedef int (*PreInitFn) (void);
 PreInitFn preInit;
 
-// FIXME: this symbol needs implementing on the cp-5.0 branch ...
 preInit = (PreInitFn)dlsym(handle, "lok_preinit");
 if (!preInit)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Fail to build on Windows 7 (32 bits)

[julien2412]

Here it is! (see attachment)
build.log   

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/Fail-to-build-on-Windows-7-32-bits-tp4156056p4157616.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: vs 2013 integration - class view/code assist

[Ashod Nakashian]

On Tue, Aug 18, 2015 at 12:48 PM, Markus Mohrhard <
markus.mohrh...@googlemail.com> wrote:

> Hey Oliver,
>
> On Tue, Aug 18, 2015 at 5:27 PM, Oliver Brinzing 
> wrote:
>
>> Hi,
>>
>> i managed to build a debug version of lo 5.0.1. after running
>> "/opt/lo/bin/make vs2013-ide-integration"
>> i have 392 projects in Solution Explorer, but it seems, only a few
>> projects are "included".
>>
>> for example "Library swui" (i played with
>> core\sw\source\ui\misc\bookmark.cxx)
>> has no class view and code assist while "Library ado" has.
>>
>> at first i added the "source/inc" folders via context menu ("Include In
>> Project")
>>
>> to make it compile i had to change compiler settings:
>> Property Pages/Configuration Properties/NMake/General/Build Command Line
>> -> from "Library_None" to "Library_swui"
>>
>> for class view and code assit i had to add "PreprocessorDefinitions" and
>> "Include Search Path" in Section "IntelliSense"
>>
>> is it necessary to add all these entries by hand or did i miss something ?
>> do we have a guideline somewhere ?
>>
>> any hints are welcome.
>>
>
>
> In general the ide-integration scripts are not really maintained. So if
> you want to use them you might need to fix a few things that got broken
> recently.
>

And to add to Markus's response, it'd be great to have patches that improve
things. So feel free to submit your fixes.
Thanks.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: vs 2013 integration - class view/code assist

[Markus Mohrhard]

Hey Oliver,

On Tue, Aug 18, 2015 at 5:27 PM, Oliver Brinzing 
wrote:

> Hi,
>
> i managed to build a debug version of lo 5.0.1. after running
> "/opt/lo/bin/make vs2013-ide-integration"
> i have 392 projects in Solution Explorer, but it seems, only a few
> projects are "included".
>
> for example "Library swui" (i played with
> core\sw\source\ui\misc\bookmark.cxx)
> has no class view and code assist while "Library ado" has.
>
> at first i added the "source/inc" folders via context menu ("Include In
> Project")
>
> to make it compile i had to change compiler settings:
> Property Pages/Configuration Properties/NMake/General/Build Command Line
> -> from "Library_None" to "Library_swui"
>
> for class view and code assit i had to add "PreprocessorDefinitions" and
> "Include Search Path" in Section "IntelliSense"
>
> is it necessary to add all these entries by hand or did i miss something ?
> do we have a guideline somewhere ?
>
> any hints are welcome.
>


In general the ide-integration scripts are not really maintained. So if you
want to use them you might need to fix a few things that got broken
recently.

Regards,
Markus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Build WebDAV neon/serf: differences among the two

[Giuseppe Castagno]

Hi Michael,

On 08/18/2015 03:16 PM, Michael Stahl wrote:

On 13.08.2015 17:32, Giuseppe Castagno wrote:

Other observations.


...




Starting from V. 1.3.0 serf uses scons build system, not configure/make.


oh well there had to be a catch... i believe we don't have anything
with scons currently, so it remains to be seen if and how that will
support finding our bundled libraries instead of system libraries,
building on Windows with MSVC (and using debug runtimes with
--enable-dbgutil), cross-compiling for Android/iOS, etc.


to be able to compile serf-1.3.8 I rewrote the way it's built: 
practically writing a make specific for Windows, in Linux I used scons 
instead.


To use scons in Windows+cygwin+MSCV proved to be a nightmare.

In short reworking all this for LO can be a difficult task.

Michael, in Sept 30th, ESC [1], you asked why not curl instead of serf.

The reason you asked it's because is in the codebase, and it uses NSS, 
right?

Other reasons I don't know?

Briefly searching in LO I found curl is used in cmis, where it does a 
similar task as it would be requested in WebDAV.


--
Kind Regards,
Giuseppe Castagno aka beppec5
Acca Esse http://www.acca-esse.eu
giuseppe.castagno at acca-esse.eu
[1] 
http://nabble.documentfoundation.org/Libreoffice-qa-Minutes-of-ESC-call-2015-07-30-tt4156012.html

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-commits] core.git: slideshow/source

[Thorsten Behrens]

Daniel Robertson wrote:
> Author: Daniel Robertson 
> Date:   Sun Aug 16 13:55:51 2015 -0400
> 
> slideshow: replace for_each with range-based for
> [etc...]
>
Hi Daniel,

thanks a lot for the nice cleanup task you did, great job - your stats
so far:

94 insertions(+), 485 deletions(-), -391 net

Things got *much* more readable with the above! :)

Anything on your mind yet what to do next? Want to continue in other
modules? Otherwise, if templates & reducing code bloat is your thing,
perhaps I could pique your further interest with
https://bugs.documentfoundation.org/show_bug.cgi?id=62525 ?

Cheers,

-- Thorsten


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: cui/source fpicker/source include/svtools include/unotools sd/source sfx2/source svtools/source unotools/source

[Caolán McNamara]

 cui/source/dialogs/hldocntp.cxx   |2 +-
 cui/source/dialogs/hldoctp.cxx|3 +--
 fpicker/source/office/iodlg.cxx   |2 +-
 include/svtools/inettbc.hxx   |2 +-
 include/unotools/localfilehelper.hxx  |2 +-
 sd/source/filter/ppt/pptin.cxx|2 +-
 sfx2/source/appl/linkmgr2.cxx |2 +-
 sfx2/source/inet/inettbc.cxx  |2 +-
 svtools/source/control/inettbc.cxx|   10 --
 unotools/source/ucbhelper/localfilehelper.cxx |2 +-
 10 files changed, 13 insertions(+), 16 deletions(-)

New commits:
commit bdc3053067175eea4d30d5ca6d304366174c9316
Author: Caolán McNamara 
Date:   Tue Aug 18 14:50:11 2015 +0100

rBaseURL argument now unused

Change-Id: I02cacfeaf26788ed024fa9753af132f0d5822e6f

diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 332d45f..d67771a 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -407,7 +407,7 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl)
 
 OUStringaStrURL;
 OUStringaTempStrURL( m_pCbbPath->GetText() );
-utl::LocalFileHelper::ConvertSystemPathToURL( aTempStrURL, 
m_pCbbPath->GetBaseURL(), aStrURL );
+utl::LocalFileHelper::ConvertSystemPathToURL( aTempStrURL, aStrURL );
 
 OUStringaStrPath = aStrURL;
 boolbZeroPath = aStrPath.isEmpty();
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 2ff99465..4e710cc 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -118,7 +118,6 @@ OUString SvxHyperlinkDocTp::GetCurrentURL ()
 // get data from dialog-controls
 OUString aStrURL;
 OUString aStrPath ( m_pCbbPath->GetText() );
-const OUString aBaseURL ( m_pCbbPath->GetBaseURL() );
 OUString aStrMark( m_pEdTarget->GetText() );
 
 if ( aStrPath != aEmptyStr )
@@ -127,7 +126,7 @@ OUString SvxHyperlinkDocTp::GetCurrentURL ()
 if ( aURL.GetProtocol() != INetProtocol::NotValid )// maybe the 
path is already a valid
 aStrURL = aStrPath; // hyperlink, then 
we can use this path directly
 else
-utl::LocalFileHelper::ConvertSystemPathToURL( aStrPath, aBaseURL, 
aStrURL );
+utl::LocalFileHelper::ConvertSystemPathToURL( aStrPath, aStrURL );
 
 //#105788# always create a URL even if it is not valid
 if( aStrURL == aEmptyStr )
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 123f96f..496fd8a 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -935,7 +935,7 @@ IMPL_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
 INetURLObject aFileObject( aFileName );
 if ( ( aFileObject.GetProtocol() == INetProtocol::NotValid ) && 
!aFileName.isEmpty() )
 {
-OUString sCompleted = SvtURLBox::ParseSmart( aFileName, 
_pFileView->GetViewURL(), SvtPathOptions().GetWorkPath() );
+OUString sCompleted = SvtURLBox::ParseSmart( aFileName, 
_pFileView->GetViewURL() );
 if ( !sCompleted.isEmpty() )
 aFileName = sCompleted;
 }
diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx
index 47217f2..3619ef6 100644
--- a/include/svtools/inettbc.hxx
+++ b/include/svtools/inettbc.hxx
@@ -80,7 +80,7 @@ public:
 
 voidUpdatePickList( );
 
-static OUString ParseSmart( const OUString& aText, const 
OUString& aBaseURL, const OUString& aWorkDir );
+static OUString ParseSmart( const OUString& aText, const 
OUString& aBaseURL );
 
 voidSetFilter(const OUString& _sFilter);
 
diff --git a/include/unotools/localfilehelper.hxx 
b/include/unotools/localfilehelper.hxx
index 3530dc4..a8f37c3 100644
--- a/include/unotools/localfilehelper.hxx
+++ b/include/unotools/localfilehelper.hxx
@@ -35,7 +35,7 @@ namespace utl
 Returning sal_True and an empty URL means that the URL doesn't point 
to a local file.
 */
 static bool ConvertPhysicalNameToURL(const OUString& rName, OUString& 
rReturn);
-static bool ConvertSystemPathToURL( const OUString& rName, const 
OUString& rBaseURL, OUString& rReturn );
+static bool ConvertSystemPathToURL( const OUString& rName, OUString& 
rReturn );
 
 /**
 Converts a "UCB compatible" URL into a "physical" file name.
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 813c0bc..44c3668 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2066,7 +2066,7 @@ void ImplSdPPTImport::FillSdAnimationInfo( 
SdAnimationInfo* pInfo, PptInteractiv
 OUString aBookmarkURL( pInfo->GetBookmark() );
 INetURLObject

[Libreoffice-commits] core.git: sw/qa

[Varun]

 sw/qa/extras/uiwriter/uiwriter.cxx |   22 ++
 1 file changed, 22 insertions(+)

New commits:
commit c89207eaa4ea1b55be46ea083cce174a373035b2
Author: Varun 
Date:   Tue Aug 18 20:08:50 2015 +0530

Added Test for tdf#74230 ODF export stroke and fill in graphic defaults

Change-Id: I09c15c7d5c9eaabe81029506bc9091fac42af662
Reviewed-on: https://gerrit.libreoffice.org/17840
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 8d48c7b..8bacc46 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -134,6 +134,7 @@ public:
 void testUnoParagraph();
 void testTdf60967();
 void testSearchWithTransliterate();
+void testTdf74230();
 void testTdf74363();
 void testTdf80663();
 void testTdf57197();
@@ -205,6 +206,7 @@ public:
 CPPUNIT_TEST(testUnoParagraph);
 CPPUNIT_TEST(testTdf60967);
 CPPUNIT_TEST(testSearchWithTransliterate);
+CPPUNIT_TEST(testTdf74230);
 CPPUNIT_TEST(testTdf74363);
 CPPUNIT_TEST(testTdf80663);
 CPPUNIT_TEST(testTdf57197);
@@ -1632,6 +1634,26 @@ void SwUiWriterTest::testSearchWithTransliterate()
 CPPUNIT_ASSERT_EQUAL(1,(int)case2);
 }
 
+void SwUiWriterTest::testTdf74230()
+{
+createDoc();
+//exporting the empty document to ODT via TempFile
+uno::Sequence aDescriptor;
+utl::TempFile aTempFile;
+uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
+xStorable->storeToURL(aTempFile.GetURL(), aDescriptor);
+CPPUNIT_ASSERT(aTempFile.IsValid());
+//loading an XML DOM of the "styles.xml" of the TempFile
+xmlDocPtr pXmlDoc = parseExportInternal(aTempFile.GetURL(),"styles.xml");
+//pXmlDoc should not be null
+CPPUNIT_ASSERT(pXmlDoc);
+//asserting XPath in loaded XML DOM
+assertXPath(pXmlDoc, 
"//office:styles/style:default-style[@style:family='graphic']/style:graphic-properties[@svg:stroke-color='#3465a4']");
+assertXPath(pXmlDoc, 
"//office:styles/style:default-style[@style:family='graphic']/style:graphic-properties[@draw:fill-color='#729fcf']");
+//deleting the TempFile
+aTempFile.EnableKillingFile();
+}
+
 void SwUiWriterTest::testTdf74363()
 {
 SwDoc* pDoc = createDoc();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

vs 2013 integration - class view/code assist

[Oliver Brinzing]

Hi,

i managed to build a debug version of lo 5.0.1. after running "/opt/lo/bin/make 
vs2013-ide-integration"
i have 392 projects in Solution Explorer, but it seems, only a few projects are 
"included".

for example "Library swui" (i played with core\sw\source\ui\misc\bookmark.cxx)
has no class view and code assist while "Library ado" has.

at first i added the "source/inc" folders via context menu ("Include In 
Project")

to make it compile i had to change compiler settings:
Property Pages/Configuration Properties/NMake/General/Build Command Line
-> from "Library_None" to "Library_swui"

for class view and code assit i had to add "PreprocessorDefinitions" and
"Include Search Path" in Section "IntelliSense"

is it necessary to add all these entries by hand or did i miss something ?
do we have a guideline somewhere ?

any hints are welcome.

Oliver
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: cui/source include/unotools unotools/source

[Stephan Bergmann]

 cui/source/options/optpath.cxx|2 --
 include/unotools/localfilehelper.hxx  |1 -
 unotools/source/ucbhelper/localfilehelper.cxx |6 --
 3 files changed, 9 deletions(-)

New commits:
commit 954943308dd7229593280c23b0c3c7efd875c10a
Author: Stephan Bergmann 
Date:   Tue Aug 18 17:12:24 2015 +0200

Get rid of obsolete LocalFileHelper::IsFileContent

vnd.sun.star.wfs is long gone---or what else could this have been used for?

Change-Id: If39c9bdcb983f94206e0f58b7e1e8410fdcef089

diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 7468c75..6b985e7 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -154,8 +154,6 @@ OUString Convert_Impl( const OUString& rValue )
 INetURLObject aObj( aValue );
 if ( aObj.GetProtocol() == INetProtocol::File )
 aReturn += aObj.PathToFileName();
-else if ( ::utl::LocalFileHelper::IsFileContent( aValue ) )
-aReturn += aObj.GetURLPath( INetURLObject::DECODE_WITH_CHARSET );
 if ( i+1 < nCount)
 aReturn += OUStringLiteral1();
 }
diff --git a/include/unotools/localfilehelper.hxx 
b/include/unotools/localfilehelper.hxx
index 84d5a88..3530dc4 100644
--- a/include/unotools/localfilehelper.hxx
+++ b/include/unotools/localfilehelper.hxx
@@ -47,7 +47,6 @@ namespace utl
 static bool ConvertURLToSystemPath( const OUString& rName, OUString& 
rReturn );
 
 static bool IsLocalFile(const OUString& rName);
-static bool IsFileContent(const OUString& rName);
 
 static  ::com::sun::star::uno::Sequence< OUString >
 GetFolderContents( const OUString& rFolder, 
bool bFolder );
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx 
b/unotools/source/ucbhelper/localfilehelper.cxx
index 3efc99b..d1897a3 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.cxx
@@ -82,12 +82,6 @@ bool LocalFileHelper::IsLocalFile(const OUString& rName)
 return ConvertURLToPhysicalName(rName, aTmp);
 }
 
-bool LocalFileHelper::IsFileContent(const OUString& rName)
-{
-OUString aTmp;
-return ConvertURLToSystemPath(rName, aTmp);
-}
-
 typedef ::std::vector< OUString* > StringList_Impl;
 
 ::com::sun::star::uno::Sequence < OUString > 
LocalFileHelper::GetFolderContents( const OUString& rFolder, bool bFolder )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - jurt/com

[Noel Grandin]

 jurt/com/sun/star/lib/connections/socket/socketAcceptor.java  |5 -
 jurt/com/sun/star/lib/connections/socket/socketConnector.java |4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit fe56dfd8261f311f78c375a54a09adb81489c854
Author: Noel Grandin 
Date:   Thu Jul 30 15:38:41 2015 +0200

tdf#93410 - NPE while connecting to LibreOffice via Java UNO API

The below commit fixes this as bug as a side-effect:

fix use of TCP_NODELAY for localhost URP connections

we implemented this logic in the C++ URP code a while back, but the Java
code was not correctly updated.

Reviewed-on: https://gerrit.libreoffice.org/17427
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 
(cherry picked from commit 9ffdcc76858bc01150727345de4dfd0ef40ed8c0)

Change-Id: I377d7150f1adb69d6f86d9b4f3406163aaf85aea
Reviewed-on: https://gerrit.libreoffice.org/17708
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java 
b/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
index 022f891..da33625 100644
--- a/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
+++ b/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
@@ -152,9 +152,12 @@ public final class socketAcceptor implements XAcceptor {
 }
 // we enable tcpNoDelay for loopback connections because
 // it can make a significant speed difference on linux boxes.
-if (tcpNoDelay != null || 
((InetSocketAddress)socket.getRemoteSocketAddress()).getAddress().isLoopbackAddress())
 {
+if (tcpNoDelay != null) {
 socket.setTcpNoDelay(tcpNoDelay.booleanValue());
 }
+else if 
(((InetSocketAddress)socket.getRemoteSocketAddress()).getAddress().isLoopbackAddress())
 {
+socket.setTcpNoDelay(true);
+}
 return new SocketConnection(acceptingDescription, socket);
 }
 catch(IOException e) {
diff --git a/jurt/com/sun/star/lib/connections/socket/socketConnector.java 
b/jurt/com/sun/star/lib/connections/socket/socketConnector.java
index fc44639..c169b59 100644
--- a/jurt/com/sun/star/lib/connections/socket/socketConnector.java
+++ b/jurt/com/sun/star/lib/connections/socket/socketConnector.java
@@ -146,8 +146,10 @@ public final class socketConnector implements XConnector {
 try {
 // we enable tcpNoDelay for loopback connections because
 // it can make a significant speed difference on linux boxes.
-if (desc.getTcpNoDelay() != null || isLoopbackAddress)
+if (desc.getTcpNoDelay() != null)
 socket.setTcpNoDelay(desc.getTcpNoDelay().booleanValue());
+else if (isLoopbackAddress)
+socket.setTcpNoDelay(true);
 
 con = new SocketConnection(connectionDescription, socket);
 } catch (IOException e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - icon-themes/breeze

[andreask]

 icon-themes/breeze/framework/res/extension.png|binary
 icon-themes/breeze/framework/res/folder_32.png|binary
 icon-themes/breeze/framework/res/info_26.png  |binary
 icon-themes/breeze/framework/res/recent-documents.png |binary
 icon-themes/breeze/framework/res/remote-documents.png |binary
 icon-themes/breeze/framework/res/templates_32.png |binary
 icon-themes/breeze/res/odb_32_8.png   |binary
 icon-themes/breeze/res/odf_32_8.png   |binary
 icon-themes/breeze/res/odg_32_8.png   |binary
 icon-themes/breeze/res/odp_32_8.png   |binary
 icon-themes/breeze/res/ods_32_8.png   |binary
 icon-themes/breeze/res/odt_32_8.png   |binary
 12 files changed

New commits:
commit a23d5bc8bb3c43f31d2d66fcac0d28e273d948a8
Author: andreask 
Date:   Tue Aug 18 01:30:30 2015 +0200

Breeze: StartCenter icon size fixed to 32px tdf#93064 tdf#92242

Change-Id: I3501c917f5916b49b7cda35b89cafcc27987d828
Reviewed-on: https://gerrit.libreoffice.org/17820
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 9eec11735cf929cbb5da72bc500e9ad1735c4bf3)
Reviewed-on: https://gerrit.libreoffice.org/17838
Reviewed-by: Thorsten Behrens 

diff --git a/icon-themes/breeze/framework/res/extension.png 
b/icon-themes/breeze/framework/res/extension.png
index 0495357..75fb1f8 100644
Binary files a/icon-themes/breeze/framework/res/extension.png and 
b/icon-themes/breeze/framework/res/extension.png differ
diff --git a/icon-themes/breeze/framework/res/folder_32.png 
b/icon-themes/breeze/framework/res/folder_32.png
index 898f4f2..0cdb329 100644
Binary files a/icon-themes/breeze/framework/res/folder_32.png and 
b/icon-themes/breeze/framework/res/folder_32.png differ
diff --git a/icon-themes/breeze/framework/res/info_26.png 
b/icon-themes/breeze/framework/res/info_26.png
index 7534201..6da1e8e 100644
Binary files a/icon-themes/breeze/framework/res/info_26.png and 
b/icon-themes/breeze/framework/res/info_26.png differ
diff --git a/icon-themes/breeze/framework/res/recent-documents.png 
b/icon-themes/breeze/framework/res/recent-documents.png
index 9e02125..fde5062 100644
Binary files a/icon-themes/breeze/framework/res/recent-documents.png and 
b/icon-themes/breeze/framework/res/recent-documents.png differ
diff --git a/icon-themes/breeze/framework/res/remote-documents.png 
b/icon-themes/breeze/framework/res/remote-documents.png
new file mode 100644
index 000..6e4f853
Binary files /dev/null and 
b/icon-themes/breeze/framework/res/remote-documents.png differ
diff --git a/icon-themes/breeze/framework/res/templates_32.png 
b/icon-themes/breeze/framework/res/templates_32.png
index b5adc50..efeb344 100644
Binary files a/icon-themes/breeze/framework/res/templates_32.png and 
b/icon-themes/breeze/framework/res/templates_32.png differ
diff --git a/icon-themes/breeze/res/odb_32_8.png 
b/icon-themes/breeze/res/odb_32_8.png
index a8105ff..f719738 100644
Binary files a/icon-themes/breeze/res/odb_32_8.png and 
b/icon-themes/breeze/res/odb_32_8.png differ
diff --git a/icon-themes/breeze/res/odf_32_8.png 
b/icon-themes/breeze/res/odf_32_8.png
index f90dabd..837f12d 100644
Binary files a/icon-themes/breeze/res/odf_32_8.png and 
b/icon-themes/breeze/res/odf_32_8.png differ
diff --git a/icon-themes/breeze/res/odg_32_8.png 
b/icon-themes/breeze/res/odg_32_8.png
index 64f043c..93a3083 100644
Binary files a/icon-themes/breeze/res/odg_32_8.png and 
b/icon-themes/breeze/res/odg_32_8.png differ
diff --git a/icon-themes/breeze/res/odp_32_8.png 
b/icon-themes/breeze/res/odp_32_8.png
index afcef4b..2c5deac 100644
Binary files a/icon-themes/breeze/res/odp_32_8.png and 
b/icon-themes/breeze/res/odp_32_8.png differ
diff --git a/icon-themes/breeze/res/ods_32_8.png 
b/icon-themes/breeze/res/ods_32_8.png
index de5253c..df3783e 100644
Binary files a/icon-themes/breeze/res/ods_32_8.png and 
b/icon-themes/breeze/res/ods_32_8.png differ
diff --git a/icon-themes/breeze/res/odt_32_8.png 
b/icon-themes/breeze/res/odt_32_8.png
index 4defc32..c9e1a13 100644
Binary files a/icon-themes/breeze/res/odt_32_8.png and 
b/icon-themes/breeze/res/odt_32_8.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-1' - officecfg/registry

[Eike Rathke]

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu|2 +-
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2a43a11b6580364c96d16ce8c6bfe5acd49652e5
Author: Eike Rathke 
Date:   Mon Aug 17 13:37:18 2015 +0200

Resolves: tdf#93326 >Fill< to >F~ill<, >Ed~it Mode< to >E~dit Mode<

in Edit menu ~d seems not to be used by any application.

Change-Id: I55c58130e7e95dc3d22a254c41e0d09c7ae49583
Reviewed-on: https://gerrit.libreoffice.org/17804
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Thorsten Behrens 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index c380155..c82ed03 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1841,7 +1841,7 @@
   
   
 
-  Fill
+  F~ill
 
   
   
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 7e2f00b..91aa011 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2456,7 +2456,7 @@
   
   
 
-  Ed~it Mode
+  E~dit Mode
 
 
   9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/formula oox/source sc/inc sc/qa sc/source sc/uiconfig

[Katarina Behrens]

 include/formula/grammar.hxx   |6 +-
 oox/source/core/xmlfilterbase.cxx |6 +-
 oox/source/token/namespaces-strict.txt|3 +
 oox/source/token/namespaces.hxx.tail  |1 
 oox/source/token/namespaces.txt   |3 +
 oox/source/token/tokens.txt   |8 +++
 sc/inc/calcconfig.hxx |2 
 sc/inc/unonames.hxx   |1 
 sc/qa/unit/ucalc_formula.cxx  |   11 ++--
 sc/source/core/tool/calcconfig.cxx|   12 
 sc/source/core/tool/interpr1.cxx  |   18 +-
 sc/source/filter/excel/excdoc.cxx |   13 
 sc/source/filter/excel/xeextlst.cxx   |   45 +
 sc/source/filter/inc/extlstcontext.hxx|   22 
 sc/source/filter/inc/xeextlst.hxx |   19 ++-
 sc/source/filter/oox/extlstcontext.cxx|   54 
 sc/source/filter/oox/workbookfragment.cxx |3 +
 sc/source/filter/oox/workbookhelper.cxx   |   22 ++--
 sc/source/ui/optdlg/calcoptionsdlg.cxx|   24 -
 sc/source/ui/unoobj/confuno.cxx   |   58 ++
 sc/uiconfig/scalc/ui/formulacalculationoptions.ui |1 
 21 files changed, 300 insertions(+), 32 deletions(-)

New commits:
commit 77cf7b7758dde33dac8e2e2edf0fbffd98af60e3
Author: Katarina Behrens 
Date:   Mon Jul 13 18:41:19 2015 +0200

tdf#92256: Improved interop of INDIRECT function

This is a combination of 12 commits from master branch:

tdf#92256: ODF save/load syntax for string reference

Related tdf#92256: map CONV_OOO to listbox item no.1

tdf#92256: Introducing CONV_A1_XL_A1 address pseudoconvention

tdf#92256: OOXML save/load syntax for string reference

add unhandled case in switch

that comment is not correct anymore

don't generate invalid XLSX files

tdf#92256: Handle case when string ref syntax is unknown

tdf#92256: Make OOXML filter CONV_A1_XL_A1 aware too

tdf#92256: Make sure ref syntax of Excel docs gets saved

tdf#92256: Save ref syntax when different from native one

tdf#92256: Don't force CalcA1 syntax on all !Microsoft xlsx docs

Change-Id: I226d5644ce729f1311aefc9a8998b3a75633c334
Reviewed-on: https://gerrit.libreoffice.org/17837
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/include/formula/grammar.hxx b/include/formula/grammar.hxx
index 4f6a2bc..618db98 100644
--- a/include/formula/grammar.hxx
+++ b/include/formula/grammar.hxx
@@ -43,7 +43,11 @@ public:
 
 CONV_LOTUS_A1,  /* external? 3d? A1.B2  */
 
-CONV_LAST   /* for loops, must always be last */
+CONV_LAST,   /* for loops, must always be last */
+
+// not a real address convention, a special case for INDIRECT function 
interpretation
+// only -> try using CONV_OOO, failing that CONV_XL_A1
+CONV_A1_XL_A1
 };
 
 //! CONV_UNSPECIFIED is a negative value!
diff --git a/oox/source/core/xmlfilterbase.cxx 
b/oox/source/core/xmlfilterbase.cxx
index 4ef16d0..13deec2 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -118,7 +118,8 @@ struct NamespaceIds: public rtl::StaticWithInit<
 "http://schemas.openxmlformats.org/markup-compatibility/2006";,
 "http://schemas.openxmlformats.org/spreadsheetml/2006/main/v2";,
 "http://schemas.microsoft.com/office/drawing/2008/diagram";,
-"http://schemas.microsoft.com/office/spreadsheetml/2009/9/main";
+"http://schemas.microsoft.com/office/spreadsheetml/2009/9/main";,
+"http://schemas.libreoffice.org/";
 };
 
 static const sal_Int32 namespaceIds[] = {
@@ -145,7 +146,8 @@ struct NamespaceIds: public rtl::StaticWithInit<
 NMSP_mce,
 NMSP_mceTest,
 NMSP_dsp,
-NMSP_xls14Lst
+NMSP_xls14Lst,
+NMSP_loext
 };
 
 Sequence< beans::Pair< OUString, sal_Int32 > > 
aRet(SAL_N_ELEMENTS(namespaceIds));
diff --git a/oox/source/token/namespaces-strict.txt 
b/oox/source/token/namespaces-strict.txt
index 9359f8b..026fcfe 100644
--- a/oox/source/token/namespaces-strict.txt
+++ b/oox/source/token/namespaces-strict.txt
@@ -80,3 +80,6 @@ a14 
http://schemas.microsoft.com/office/drawingml/2010/main
 
 # xls14Lst for features introduced by excel 2010
 xls14Lst   
http://schemas.microsoft.com/office/spreadsheetml/2009/9/main
+
+# LibreOffice's own extensions
+loext  http://schemas.libreoffice.org/
diff --git a/oox/source/token/namespaces.hxx.tail 
b/oox/source/token/namespaces.hxx.tail
index de5cc21..24de645 100644
--- a/oox/source/token/namespaces.hxx.tail
+++ b/oox/source/token/namespaces.h

[Libreoffice-commits] core.git: vcl/source vcl/unx

[Mark Hung]

 vcl/source/gdi/sallayout.cxx|2 +-
 vcl/unx/generic/gdi/cairotextrender.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8ead1423f10dee87967c5fabb2f26046bbb8
Author: Mark Hung 
Date:   Tue Aug 18 20:17:05 2015 +0800

tdf#832525 - Wrong punctuation direction after Chinese characters in

vertical layout.

Change-Id: I6391e665db205545f0d660e3de826755c954f286
Reviewed-on: https://gerrit.libreoffice.org/17836
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 2e1461f..3fcf3c6 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -200,7 +200,7 @@ int GetVerticalFlags( sal_UCS4 nChar )
  are GF_NONE also, but already handled in the outer if condition
 */
 if((nChar >= 0x3008 && nChar <= 0x301C && nChar != 0x3012)
-|| (nChar == 0xFF3B || nChar == 0xFF3D)
+|| (nChar == 0xFF3B || nChar == 0xFF3D || nChar==0xFF08 || 
nChar==0xFF09)
 || (nChar >= 0xFF5B && nChar <= 0xFF9F) // halfwidth forms
 || (nChar == 0xFFE3) )
 return GF_NONE; // not rotated
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx 
b/vcl/unx/generic/gdi/cairotextrender.cxx
index ebef272..0f9fafc 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -248,7 +248,7 @@ void CairoTextRender::DrawServerFontLayout( const 
ServerFontLayout& rLayout )
 {
 int nGlyphRotation = *aI;
 
-std::vector::const_iterator aNext = std::find_if(aI+1, aEnd, 
hasRotation);
+std::vector::const_iterator aNext = 
nGlyphRotation?(aI+1):std::find_if(aI+1, aEnd, hasRotation);
 
 size_t nStartIndex = std::distance(aStart, aI);
 size_t nLen = std::distance(aI, aNext);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Build Error -1073740940

[Oliver Brinzing]

Hi Michael,

> very odd... do you still have this problem?

no, i am pretty sure my anti virus tool caused the problems.
after disabling the "Identity Protection Service" (caused up to 50% cpu usage 
during builds!)
and adding cygwin/source folders to the exclude list, i can even build lo 5.0.1 with 
"make -j 4"


which "make" are you using?
i see that the wiki still recommends to download make-85047eb-msvc.exe ...


yes, i followed the wiki instructions


does it help if you try my make 4.1 release build from here as /opt/lo/bin/make:


not tried yet

at the moment i am struggling with vs 2013 integration ...

Regards
Oliver
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 6 commits - include/ucbhelper package/inc package/source svl/source ucbhelper/Library_ucbhelper.mk ucbhelper/source unotools/inc unotools/source vcl/unx

[Stephan Bergmann]

 include/ucbhelper/fileidentifierconverter.hxx   |   97 
 package/inc/pch/precompiled_package2.hxx|1 
 package/source/zippackage/ZipPackage.cxx|   15 ---
 svl/source/fsstor/fsfactory.cxx |1 
 svl/source/fsstor/fsstorage.cxx |   17 ---
 ucbhelper/Library_ucbhelper.mk  |1 
 ucbhelper/source/client/fileidentifierconverter.cxx |   77 ---
 unotools/inc/pch/precompiled_utl.hxx|1 
 unotools/source/ucbhelper/localfilehelper.cxx   |   76 ---
 unotools/source/ucbhelper/tempfile.cxx  |   12 --
 vcl/unx/kde/fpicker/kdefilepicker.cxx   |2 
 11 files changed, 28 insertions(+), 272 deletions(-)

New commits:
commit c4fe12406040b3395d3964406073027bd4006243
Author: Stephan Bergmann 
Date:   Tue Aug 18 15:31:59 2015 +0200

Remove mention of long-gone vnd.sun.star.wfs

Change-Id: I534da08398504697aa4ecff7838c6bd702dc8ea0

diff --git a/vcl/unx/kde/fpicker/kdefilepicker.cxx 
b/vcl/unx/kde/fpicker/kdefilepicker.cxx
index 757433a..a5c8092 100644
--- a/vcl/unx/kde/fpicker/kdefilepicker.cxx
+++ b/vcl/unx/kde/fpicker/kdefilepicker.cxx
@@ -97,7 +97,7 @@ bool isSupportedProtocol( const QString &rProtocol )
 const char * pOOoProtocols[] = { "", "smb", "ftp", "http", "file", 
"mailto",
 "vnd.sun.star.webdav", "news", "private", "vnd.sun.star.help",
 "https", "slot", "macro", "javascript", "imap", "pop3", "data",
-"cid", "out", "vnd.sun.star.wfs", "vnd.sun.star.hier", "vim",
+"cid", "out", "vnd.sun.star.hier", "vim",
 ".uno", ".component", "vnd.sun.star.pkg", "ldap", "db",
 "vnd.sun.star.cmd", "vnd.sun.star.script",
 "telnet",
commit 3d1e29c55b4322f6113842123e5c0ee43df03a16
Author: Stephan Bergmann 
Date:   Tue Aug 18 15:29:50 2015 +0200

Remove newly unused ucbhelper/fileidentifierconverter.hxx

Change-Id: I7c272383ecb115e19699ed96bf5622d979403a01

diff --git a/include/ucbhelper/fileidentifierconverter.hxx 
b/include/ucbhelper/fileidentifierconverter.hxx
deleted file mode 100644
index 27e7c8e..000
--- a/include/ucbhelper/fileidentifierconverter.hxx
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_UCBHELPER_FILEIDENTIFIERCONVERTER_HXX
-#define INCLUDED_UCBHELPER_FILEIDENTIFIERCONVERTER_HXX
-
-#include 
-#include 
-#include 
-#include 
-
-namespace com { namespace sun { namespace star { namespace ucb {
-class XUniversalContentBroker;
-} } } }
-
-namespace ucbhelper {
-
-/** Using a specific content provider manager, convert a file path in system
-dependent notation to a (file) URL.
-
-@param rManager
-A content provider manager.  Must not be null.
-
-@param rBaseURL
-See the corresponding parameter of
-com::sun::star::ucb::XFileIdentifierConverter::getFileURLFromSystemPath().
-
-@param rURL
-See the corresponding parameter of
-com::sun::star::ucb::XFileIdentifierConverter::getFileURLFromSystemPath().
-
-@returns
-a URL, if the content provider registered at the content provider manager
-that is responsible for the base URL returns a URL when calling
-com::sun::star::ucb::XFileIdentiferConverter::getFileURLFromSystemPath()
-on it.  Otherwise, an empty string is returned.
-
-@see
-com::sun::star::ucb::XFileIdentiferConverter::getFileURLFromSystemPath().
- */
-UCBHELPER_DLLPUBLIC OUString
-getFileURLFromSystemPath(
-com::sun::star::uno::Reference<
-com::sun::star::ucb::XUniversalContentBroker > const &
-rUcb,
-OUString const & rBaseURL,
-OUString const & rSystemPath);
-
-
-/** Using a specific content provider manager, convert a (file) URL to a
-file path in system dependent notation.
-
-@param rManager
-A content provider manager.  Must not be null.
-
-@param rURL
-See the corresponding parameter of
-com::sun::star::ucb::XFileIdentiferConverter::getSystemPathFromFileURL().
-
-@returns
-a system path, if the content provider register

Re: Build WebDAV neon/serf: differences among the two

[Michael Stahl]

On 13.08.2015 17:32, Giuseppe Castagno wrote:
> Other observations.
> Serf vers. 1.2.1 currently in LO lack NTLM (Windows) authorization.

... which neon claims to support.

> Vers. 1.3.8, last available, has it.

> Serf uses OpenSSL, Zip, apr and apr-util libraries.

... and its long list of dependencies that we need to bundle is the one
thing i don't like about it :)

> Starting from V. 1.3.0 serf uses scons build system, not configure/make.

oh well there had to be a catch... i believe we don't have anything
with scons currently, so it remains to be seen if and how that will
support finding our bundled libraries instead of system libraries,
building on Windows with MSVC (and using debug runtimes with
--enable-dbgutil), cross-compiling for Android/iOS, etc.



___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: writerfilter/source

[Caolán McNamara]

 writerfilter/source/filter/RtfFilter.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cfa853c07fd4632fa40e62a5b4474c55d4588416
Author: Caolán McNamara 
Date:   Tue Aug 18 14:04:58 2015 +0100

this debugging code can definitely use osl

Change-Id: I420e7f242868a25a2f9a473c23c67dfd9a285b7c

diff --git a/writerfilter/source/filter/RtfFilter.cxx 
b/writerfilter/source/filter/RtfFilter.cxx
index 7bf88b2..752330c 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -29,7 +29,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -119,7 +119,7 @@ sal_Bool RtfFilter::filter(const uno::Sequence< 
beans::PropertyValue >& aDescrip
 // If this is set, write to this file, instead of the real document 
during paste.
 char* pEnv = getenv("SW_DEBUG_RTF_PASTE_TO");
 OUString aOutStr;
-if (!bIsNewDoc && pEnv && 
utl::LocalFileHelper::ConvertPhysicalNameToURL(OUString::fromUtf8(pEnv), 
aOutStr))
+if (!bIsNewDoc && pEnv && 
osl::FileBase::getFileURLFromSystemPath(OUString::fromUtf8(pEnv), aOutStr) == 
osl::FileBase::E_None)
 {
 std::unique_ptr 
pOut(utl::UcbStreamHelper::CreateStream(aOutStr, StreamMode::WRITE));
 std::unique_ptr 
pIn(utl::UcbStreamHelper::CreateStream(xInputStream));
@@ -132,7 +132,7 @@ sal_Bool RtfFilter::filter(const uno::Sequence< 
beans::PropertyValue >& aDescrip
 if (!bIsNewDoc && pEnv)
 {
 OUString aInStr;
-
utl::LocalFileHelper::ConvertPhysicalNameToURL(OUString::fromUtf8(pEnv), 
aInStr);
+osl::FileBase::getFileURLFromSystemPath(OUString::fromUtf8(pEnv), 
aInStr);
 SvStream* pStream = utl::UcbStreamHelper::CreateStream(aInStr, 
StreamMode::READ);
 uno::Reference xStream(new 
utl::OStreamWrapper(*pStream));
 xInputStream.set(xStream, uno::UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Debug build breaks in unit test

[Markus Mohrhard]

On Tue, Aug 18, 2015 at 3:02 PM, Markus Mohrhard <
markus.mohrh...@googlemail.com> wrote:

> Hey Regina,
>
>
> On Thu, Aug 13, 2015 at 5:05 PM, Regina Henschel 
> wrote:
>
>> Hi all,
>>
>> Christian Lohmaier schrieb:
>>
>>> Hi *,
>>>
>>> On Sun, Aug 9, 2015 at 4:33 PM, Oliver Brinzing 
>>> wrote:
>>>
 Hi Regina,

 ->

 https://wiki.documentfoundation.org/Development/BuildingOnWindows#System_PATH_causing_weird_build_breakage
  -> BitDefender / other Anti-Virus / security tools breaking the
 build

 i told my anti virus not to scan c:\cygwin\* and c:\sources\*

>>>
>>> Note that you also need to include the temporary directory (or set
>>> TMPDIR to a path below the ones above, so that it is covered as well)
>>>
>>
>> I have disabled virus scan totally while building.
>>
>>>
>>> pasebin.ca is down right now, so cannot have a look at Regina's log,
>>> but by defaullt, the build won't run those cve-document tests and
>>> should not trigger the problem.
>>>
>>
>> I have nailed it down. Exactly one test fails. It is
>> CPPUNIT_TEST(testMediaEmbedding);
>> from CPPUNIT_TEST_SUITE(SdExportTest);
>>
>> The log is not too long, so I paste it below.
>>
>> Kind regards
>> Regina
>>
>> C:/cygwin/opt/lo/bin/make -j 4 -rs -f
>> C:/LO_buildDebug/core/Makefile.gbuild CppunitTest_sd_export_tests
>> [build PRL] CustomTarget/postprocess/images/sorted.lst
>> [build PRL] CustomTarget/postprocess/images/commandimagelist.ilst
>> [build PRL] CustomTarget/postprocess/images/images_breeze.zip
>> [build PRL] CustomTarget/postprocess/images/images_galaxy.zip
>> [build PRL] CustomTarget/postprocess/images/images_hicontrast.zip
>> [build PRL] CustomTarget/postprocess/images/images_oxygen.zip
>> [build PRL] CustomTarget/postprocess/images/images_sifr.zip
>> [build PRL] CustomTarget/postprocess/images/images_tango.zip
>> [build PRL] CustomTarget/postprocess/images/images_tango_testing.zip
>> [build CXX] sd/qa/unit/export-tests.cxx
>> [build DEP] LNK:CppunitTest/test_sd_export_tests.dll
>> [build LNK] CppunitTest/test_sd_export_tests.dll
>>Creating library
>> C:/LO_buildDebug/core/workdir/LinkTarget/CppunitTest/itest_sd_export_tests.lib
>> and object
>> C:/LO_buildDebug/core/workdir/LinkTarget/CppunitTest/itest_sd_export_tests.exp
>> [build CUT] sd_export_tests
>> /usr/bin/sh: Zeile 1:  5968 Segmentation fault
>> PATH="C:\LO_buildDebug\core\instdir\program;C:\LO_buildDebug\core\instdir\program;C:\LO_buildDebug\core\workdir\LinkTarget\Library;C:\LO_buildDebug\core\workdir\UnpackedTarball\cppunit\src\cppunit\DebugDll;$PATH"
>> $W/LinkTarget/Executable/cppunittester.exe
>> $W/LinkTarget/CppunitTest/test_sd_export_tests.dll --headless
>> "-env:BRAND_BASE_DIR=file:///$S/instdir" "-env:BRAND_SHARE_SUBDIR=share"
>> "-env:UserInstallation=file:///$W/CppunitTest/sd_export_tests.test.user"
>> "-env:CONFIGURATION_LAYERS=xcsxcu:file:///$I/share/registry
>> xcsxcu:file:///$W/unittest/registry"
>> "-env:UNO_TYPES=file:///$I/program/types/offapi.rdb
>> file:///$I/program/types.rdb"
>> "-env:UNO_SERVICES=file:///$W/Rdb/ure/services.rdb
>> file:///$W/Rdb/services.rdb" -env:URE_INTERNAL_LIB_DIR=file:///$I/program
>> -env:LO_LIB_DIR=file:///$I/program
>> -env:LO_JAVA_DIR=file:///$I/program/classes --protector
>> $W/LinkTarget/Library/unoexceptionprotector.dll unoexceptionprotector
>> --protector $W/LinkTarget/Library/unobootstrapprotector.dll
>> unobootstrapprotector --protector
>> $W/LinkTarget/Library/vclbootstrapprotector.dll vclbootstrapprotector
>> -env:SVG_DISABLE_FONT_EMBEDDING= > $W/CppunitTest/sd_export_tests.test.log
>> 2>&1
>> warn:legacy.tools:1112:364:sfx2/source/appl/app.cxx:202: No DDE-Service
>> possible. Error: 16399
>> warn:vcl.opengl.win:1112:364:vcl/opengl/win/WinDeviceInfo.cxx:914: error
>> parsing blacklist
>> warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757:
>> caught Exception "an error occurred during file opening" while opening
>> 
>> warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757:
>> caught Exception "an error occurred during file opening" while opening
>> 
>> warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757:
>> caught Exception "an error occurred during file opening" while opening
>> 
>> warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757:
>> caught Exception "an error occurred during file opening" while opening
>> 
>> warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757:
>> caught Exception "an error occurred during file opening" while opening
>> 
>> warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757:
>> caught Exception "an error occurred during file opening" while opening
>> 
>> warn:basic:1112:364:basic/source/uno/namecont.cxx:1013: Cannot access
>> extensions!
>> warn:basic:1112:364:basic/source/uno/namecont.cxx:1013: Cannot access
>> extensions!
>> warn:xmloff:1112:364:xmloff/source/style/impastpl.cxx:432: Adding
>> duplicate family graphic wit

Re: Debug build breaks in unit test

[Norbert Thiebaud]

On Tue, Aug 18, 2015 at 7:56 AM, Michael Stahl  wrote:
> On 10.08.2015 03:22, Norbert Thiebaud wrote:
>
>> PS: PARALLELISM=1 should _not_ be needed... we are building literally
>> thousands of build a month an all 3 platforms and none of these build
>> is running PARALLELISM=1, thankfully as the build is long enough as it
>> is...
>
> it is true that it should not be needed, but when your build breaks it
> will make it much more obvious *which* command failed.

or it will hide it.
either the bug is systematic and the difficulty to identify the
culprit is a display problem.. for instance Windows build are flooded
with zillions of link warning that make indeed very hard to find
the actual failure... and in debug mode the dumping of thousand of
random info: warn: message also hide the tree in the forest.
but these are also true in -j1

if the bug is not systematic it is quite possible that it will stop
showing at -j1

In any case rebuilding the entire thing with -j1 is wasteful and
discouraging and imo that should never be the 'answer'.

Norbert
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Debug build breaks in unit test

[Markus Mohrhard]

Hey Regina,

On Thu, Aug 13, 2015 at 5:05 PM, Regina Henschel 
wrote:

> Hi all,
>
> Christian Lohmaier schrieb:
>
>> Hi *,
>>
>> On Sun, Aug 9, 2015 at 4:33 PM, Oliver Brinzing 
>> wrote:
>>
>>> Hi Regina,
>>>
>>> ->
>>>
>>> https://wiki.documentfoundation.org/Development/BuildingOnWindows#System_PATH_causing_weird_build_breakage
>>>  -> BitDefender / other Anti-Virus / security tools breaking the
>>> build
>>>
>>> i told my anti virus not to scan c:\cygwin\* and c:\sources\*
>>>
>>
>> Note that you also need to include the temporary directory (or set
>> TMPDIR to a path below the ones above, so that it is covered as well)
>>
>
> I have disabled virus scan totally while building.
>
>>
>> pasebin.ca is down right now, so cannot have a look at Regina's log,
>> but by defaullt, the build won't run those cve-document tests and
>> should not trigger the problem.
>>
>
> I have nailed it down. Exactly one test fails. It is
> CPPUNIT_TEST(testMediaEmbedding);
> from CPPUNIT_TEST_SUITE(SdExportTest);
>
> The log is not too long, so I paste it below.
>
> Kind regards
> Regina
>
> C:/cygwin/opt/lo/bin/make -j 4 -rs -f
> C:/LO_buildDebug/core/Makefile.gbuild CppunitTest_sd_export_tests
> [build PRL] CustomTarget/postprocess/images/sorted.lst
> [build PRL] CustomTarget/postprocess/images/commandimagelist.ilst
> [build PRL] CustomTarget/postprocess/images/images_breeze.zip
> [build PRL] CustomTarget/postprocess/images/images_galaxy.zip
> [build PRL] CustomTarget/postprocess/images/images_hicontrast.zip
> [build PRL] CustomTarget/postprocess/images/images_oxygen.zip
> [build PRL] CustomTarget/postprocess/images/images_sifr.zip
> [build PRL] CustomTarget/postprocess/images/images_tango.zip
> [build PRL] CustomTarget/postprocess/images/images_tango_testing.zip
> [build CXX] sd/qa/unit/export-tests.cxx
> [build DEP] LNK:CppunitTest/test_sd_export_tests.dll
> [build LNK] CppunitTest/test_sd_export_tests.dll
>Creating library
> C:/LO_buildDebug/core/workdir/LinkTarget/CppunitTest/itest_sd_export_tests.lib
> and object
> C:/LO_buildDebug/core/workdir/LinkTarget/CppunitTest/itest_sd_export_tests.exp
> [build CUT] sd_export_tests
> /usr/bin/sh: Zeile 1:  5968 Segmentation fault
> PATH="C:\LO_buildDebug\core\instdir\program;C:\LO_buildDebug\core\instdir\program;C:\LO_buildDebug\core\workdir\LinkTarget\Library;C:\LO_buildDebug\core\workdir\UnpackedTarball\cppunit\src\cppunit\DebugDll;$PATH"
> $W/LinkTarget/Executable/cppunittester.exe
> $W/LinkTarget/CppunitTest/test_sd_export_tests.dll --headless
> "-env:BRAND_BASE_DIR=file:///$S/instdir" "-env:BRAND_SHARE_SUBDIR=share"
> "-env:UserInstallation=file:///$W/CppunitTest/sd_export_tests.test.user"
> "-env:CONFIGURATION_LAYERS=xcsxcu:file:///$I/share/registry
> xcsxcu:file:///$W/unittest/registry"
> "-env:UNO_TYPES=file:///$I/program/types/offapi.rdb
> file:///$I/program/types.rdb"
> "-env:UNO_SERVICES=file:///$W/Rdb/ure/services.rdb
> file:///$W/Rdb/services.rdb" -env:URE_INTERNAL_LIB_DIR=file:///$I/program
> -env:LO_LIB_DIR=file:///$I/program
> -env:LO_JAVA_DIR=file:///$I/program/classes --protector
> $W/LinkTarget/Library/unoexceptionprotector.dll unoexceptionprotector
> --protector $W/LinkTarget/Library/unobootstrapprotector.dll
> unobootstrapprotector --protector
> $W/LinkTarget/Library/vclbootstrapprotector.dll vclbootstrapprotector
> -env:SVG_DISABLE_FONT_EMBEDDING= > $W/CppunitTest/sd_export_tests.test.log
> 2>&1
> warn:legacy.tools:1112:364:sfx2/source/appl/app.cxx:202: No DDE-Service
> possible. Error: 16399
> warn:vcl.opengl.win:1112:364:vcl/opengl/win/WinDeviceInfo.cxx:914: error
> parsing blacklist
> warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757:
> caught Exception "an error occurred during file opening" while opening
> 
> warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757:
> caught Exception "an error occurred during file opening" while opening
> 
> warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757:
> caught Exception "an error occurred during file opening" while opening
> 
> warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757:
> caught Exception "an error occurred during file opening" while opening
> 
> warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757:
> caught Exception "an error occurred during file opening" while opening
> 
> warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757:
> caught Exception "an error occurred during file opening" while opening
> 
> warn:basic:1112:364:basic/source/uno/namecont.cxx:1013: Cannot access
> extensions!
> warn:basic:1112:364:basic/source/uno/namecont.cxx:1013: Cannot access
> extensions!
> warn:xmloff:1112:364:xmloff/source/style/impastpl.cxx:432: Adding
> duplicate family graphic with mismatching mapper ! class
> SvXMLExportPropertyMapper * class XMLShapeExportPropertyMapper
> warn:xmloff:1112:364:xmloff/source/style/impastpl.cxx:432: Adding
> duplicate family presentation with mismatchin

Re: Debug build breaks in unit test

[Michael Stahl]

On 10.08.2015 03:22, Norbert Thiebaud wrote:

> PS: PARALLELISM=1 should _not_ be needed... we are building literally
> thousands of build a month an all 3 platforms and none of these build
> is running PARALLELISM=1, thankfully as the build is long enough as it
> is...

it is true that it should not be needed, but when your build breaks it
will make it much more obvious *which* command failed.


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: include/LibreOfficeKit

[Michael Meeks]

 include/LibreOfficeKit/LibreOfficeKitInit.h |   60 +---
 1 file changed, 37 insertions(+), 23 deletions(-)

New commits:
commit a5d5ce5dfa0f0cdd048192d60c70da575a6f1735
Author: Michael Meeks 
Date:   Tue Aug 18 12:09:08 2015 +0100

lok: namespace and re-work various types & helper functions.

Change-Id: I36e2a01822883251f9556fcde0e0a9830356ac98
Reviewed-on: https://gerrit.libreoffice.org/17833
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h 
b/include/LibreOfficeKit/LibreOfficeKitInit.h
index f1966c7..c2f3426 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -40,7 +40,7 @@ extern "C"
 #endif
 #define SEPARATOR '/'
 
-void *_dlopen(const char *pFN)
+void *lok_loadlib(const char *pFN)
 {
 return dlopen(pFN, RTLD_LAZY
 #if defined __clang__ && defined __linux__ \
@@ -52,17 +52,17 @@ extern "C"
   );
 }
 
-char *_dlerror(void)
+char *lok_dlerror(void)
 {
 return dlerror();
 }
 
-void *_dlsym(void *Hnd, const char *pName)
+void *lok_dlsym(void *Hnd, const char *pName)
 {
 return dlsym(Hnd, pName);
 }
 
-int _dlclose(void *Hnd)
+int lok_dlclose(void *Hnd)
 {
 return dlclose(Hnd);
 }
@@ -80,24 +80,24 @@ extern "C"
 #define SEPARATOR '\\'
 #define UNOPATH   "\\..\\URE\\bin"
 
-void *_dlopen(const char *pFN)
+void *lok_loadlib(const char *pFN)
 {
 return (void *) LoadLibrary(pFN);
 }
 
-char *_dlerror(void)
+char *lok_dlerror(void)
 {
 LPSTR buf = NULL;
 FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | 
FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), 0, 
reinterpret_cast(&buf), 0, NULL);
 return buf;
 }
 
-void *_dlsym(void *Hnd, const char *pName)
+void *lok_dlsym(void *Hnd, const char *pName)
 {
 return GetProcAddress((HINSTANCE) Hnd, pName);
 }
 
-int _dlclose(void *Hnd)
+int lok_dlclose(void *Hnd)
 {
 return FreeLibrary((HINSTANCE) Hnd);
 }
@@ -139,16 +139,12 @@ extern "C"
 }
 #endif
 
-typedef LibreOfficeKit *(HookFunction)( const char *install_path);
-
-typedef LibreOfficeKit *(HookFunction2)( const char *install_path, const char 
*user_profile_path );
-
-static LibreOfficeKit *lok_init_2( const char *install_path,  const char 
*user_profile_path )
+static void *lok_dlopen( const char *install_path, char ** _imp_lib )
 {
 char *imp_lib;
 void *dlhandle;
-HookFunction *pSym;
-HookFunction2 *pSym2;
+
+*_imp_lib = NULL;
 
 #if !(defined(__APPLE__) && defined(__arm__))
 size_t partial_length;
@@ -172,7 +168,7 @@ static LibreOfficeKit *lok_init_2( const char 
*install_path,  const char *user_p
 imp_lib[partial_length++] = SEPARATOR;
 strcpy(imp_lib + partial_length, TARGET_LIB);
 
-dlhandle = _dlopen(imp_lib);
+dlhandle = lok_loadlib(imp_lib);
 if (!dlhandle)
 {
 // If TARGET_LIB exists, and likely is a real library (not a
@@ -183,18 +179,18 @@ static LibreOfficeKit *lok_init_2( const char 
*install_path,  const char *user_p
 if (stat(imp_lib, &st) == 0 && st.st_size > 100)
 {
 fprintf(stderr, "failed to open library '%s': %s\n",
-imp_lib, _dlerror());
+imp_lib, lok_dlerror());
 free(imp_lib);
 return NULL;
 }
 
 strcpy(imp_lib + partial_length, TARGET_MERGED_LIB);
 
-dlhandle = _dlopen(imp_lib);
+dlhandle = lok_loadlib(imp_lib);
 if (!dlhandle)
 {
 fprintf(stderr, "failed to open library '%s': %s\n",
-imp_lib, _dlerror());
+imp_lib, lok_dlerror());
 free(imp_lib);
 return NULL;
 }
@@ -203,23 +199,41 @@ static LibreOfficeKit *lok_init_2( const char 
*install_path,  const char *user_p
 imp_lib = strdup("the app executable");
 dlhandle = RTLD_MAIN_ONLY;
 #endif
+*_imp_lib = imp_lib;
+return dlhandle;
+}
+
+typedef LibreOfficeKit *(LokHookFunction)( const char *install_path);
+
+typedef LibreOfficeKit *(LokHookFunction2)( const char *install_path, const 
char *user_profile_path );
+
+typedef int (LokHookPreInit)  ( const char *install_path, const 
char *user_profile_path );
+
+static LibreOfficeKit *lok_init_2( const char *install_path,  const char 
*user_profile_path )
+{
+char *imp_lib;
+void *dlhandle;
+LokHookFunction *pSym;
+LokHookFunction2 *pSym2;
+
+dlhandle = lok_dlopen(install_path, &imp_lib);
 
-pSym2 = (HookFunction2 *) _dlsym( dlhandle, "libreofficekit_hook_2" );
+pSym2 = (LokHookFunction2 *) lok_dlsym(dlhandle, "libreofficekit_hook_2");
 if (!pSym2)
 {
 if (user_profile_path != NULL)
 {
  

Re: Build Error -1073740940

[Michael Stahl]

On 09.08.2015 11:26, Oliver Brinzing wrote:
> Hi,
> 
>  > So.. don't do that do not use --enable-verbose (for the reason
>  > stated at the top of this post.. it is broken)
> 
> ok, i removed "--enable-verbose", but now i am getting build errors again, 
> for example:
> 
> C:/cygwin/opt/lo/bin/make -j 4  -rs -f C:/sources/libo-core/Makefile.gbuild   
>  all
> [ C   ] solenv/bin/concat-deps.c
> [ CXX ] soltools/mkdepend/collectdircontent.cxx
> 
> [...]
> 
> [ RC  ] pdfimport/default
> [ RC  ] pyuno/default
> [ RC  ] pythonloader/default
> make[1]: ***.  Stop.
> make[1]:
> Makefile:250: recipe for target 'build' failed
> make: *** [build] Error 2

very odd... do you still have this problem?

which "make" are you using?

i see that the wiki still recommends to download make-85047eb-msvc.exe ...

does it help if you try my make 4.1 release build from here as
/opt/lo/bin/make:

http://people.freedesktop.org/~mst/make-4.1-msvc.exe


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Building with serf enabled: problem linking with libucpdav.

[Giuseppe Castagno]

Hi Stephan,

On 08/17/2015 12:05 PM, Stephan Bergmann wrote:

On 08/16/2015 06:26 PM, Giuseppe Castagno wrote:

Building serf webdav I ran into the following problem, linking
libucpdav1.so:

/srv5/git/LibO/lo-serf-study/workdir/UnpackedTarball/apr/.libs/libapr-1.a(rand.o):

In function `apr_os_uuid_get':
/srv5/git/LibO/lo-serf-study/workdir/UnpackedTarball/apr/misc/unix/rand.c:75:

undefined reference to `uuid_generate'


...



Should be fixed now with

"external/apr: Avoid dependency on system uuid lib."


thank you Stephan, yesterday night I was able to test WebDAV with serf.

Currently I'm reconciling the two WebDAV version, e.g. adding to serf 
version to the code I added to the neon version, limited the code

already in master.

Part of my work on WebDAV for the neon version is still here [1]

--
Kind Regards,
Giuseppe Castagno aka beppec56
Acca Esse http://www.acca-esse.eu
giuseppe.castagno at acca-esse.eu
[1] https://gerrit.libreoffice.org/#/c/17189/

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/textchainflow.cxx |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 7902ac456f8648e4fd9520626d8f4dd46f611f0b
Author: matteocam 
Date:   Tue Aug 18 14:30:48 2015 +0200

Set UpdateMode=True before constructing OF/UF Chainers

Change-Id: I26980d644942953952ae5c16fa4e230cb077470c

diff --git a/svx/source/svdraw/textchainflow.cxx 
b/svx/source/svdraw/textchainflow.cxx
index 06275e15..872b4dc 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -87,10 +87,6 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner 
*pFlowOutl, SdrOutliner *p
 bOverflow = bIsPageOverflow && mpNextLink;
 bUnderflow = !bIsPageOverflow &&  mpNextLink && mpNextLink->HasText();
 
-// Reset update mode
-pFlowOutl->SetUpdateMode(bOldUpdateMode);
-
-
 // Get old state on whether to merge para-s or not
 // NOTE: We handle UF/OF using the _old_ state. The new one is simply saved
 bool bMustMergeParaAmongLinks = 
GetTextChain()->GetIsPartOfLastParaInNextLink(mpTargetLink);
@@ -108,6 +104,9 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner 
*pFlowOutl, SdrOutliner *p
   new UFlowChainedText(pFlowOutl, 
bMustMergeParaAmongLinks) :
   NULL;
 
+// Reset update mode // Reset it here because we use WriteRTF (needing 
updatemode = true) in the two constructors above
+pFlowOutl->SetUpdateMode(bOldUpdateMode);
+
 // NOTE: Must be called after mp*ChText abd b*flow have been set but 
before mbOFisUFinduced is reset
 impUpdateCursorInfo();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 3 commits - svx/source

[matteocam]

 svx/source/svdraw/textchainflow.cxx |   42 +---
 1 file changed, 30 insertions(+), 12 deletions(-)

New commits:
commit b876fcab266ab63105e29f2b526f6df5ef654944
Author: matteocam 
Date:   Tue Aug 18 14:25:55 2015 +0200

Set UpdateMode=True before transfering text in OF/UF

Change-Id: Id01abf614bd4c842d86aa644b947f6295d6d7d6d

diff --git a/svx/source/svdraw/textchainflow.cxx 
b/svx/source/svdraw/textchainflow.cxx
index 82bb4cd..06275e15 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -156,6 +156,12 @@ bool TextChainFlow::IsUnderflow() const
 // XXX:Would it be possible to unify undeflow and its possibly following 
overrflow?
 void TextChainFlow::ExecuteUnderflow(SdrOutliner *pOutl)
 {
+bool bOldUpdateMode = pOutl->GetUpdateMode();
+
+// We need this since it's required by WriteRTF
+pOutl->SetUpdateMode(true);
+
+
 //GetTextChain()->SetNilChainingEvent(mpTargetLink, true);
 // making whole text
 OutlinerParaObject *pNewText = impGetMergedUnderflowParaObject(pOutl);
@@ -173,6 +179,9 @@ void TextChainFlow::ExecuteUnderflow(SdrOutliner *pOutl)
 pOutl->SetMaxAutoPaperSize(aOldSize);
 pOutl->SetText(*pNewText);
 
+// Reset update mode
+pOutl->SetUpdateMode(bOldUpdateMode);
+
 //GetTextChain()->SetNilChainingEvent(mpTargetLink, false);
 
 // Check for new overflow
@@ -181,6 +190,11 @@ void TextChainFlow::ExecuteUnderflow(SdrOutliner *pOutl)
 
 void TextChainFlow::ExecuteOverflow(SdrOutliner *pNonOverflOutl, SdrOutliner 
*pOverflOutl)
 {
+bool bOldUpdateMode = pNonOverflOutl->GetUpdateMode();
+
+// We need this since it's required by WriteRTF
+pNonOverflOutl->SetUpdateMode(true);
+
 //GetTextChain()->SetNilChainingEvent(mpTargetLink, true);
 // Leave only non overflowing text
 impLeaveOnlyNonOverflowingText(pNonOverflOutl);
@@ -191,6 +205,9 @@ void TextChainFlow::ExecuteOverflow(SdrOutliner 
*pNonOverflOutl, SdrOutliner *pO
 impMoveChainedTextToNextLink(pOverflOutl);
 }
 
+// Reset update mode
+pNonOverflOutl->SetUpdateMode(bOldUpdateMode);
+
 //GetTextChain()->SetNilChainingEvent(mpTargetLink, false);
 }
 
commit 3476f9dc1ceab8dedb0f93ee9d5cf87f2f30
Author: matteocam 
Date:   Tue Aug 18 14:20:33 2015 +0200

Set UpdateMode=True even with editing outl

Change-Id: I18773c8ff7447741e87d25b849b6f6b2770531dc

diff --git a/svx/source/svdraw/textchainflow.cxx 
b/svx/source/svdraw/textchainflow.cxx
index d74e441..82bb4cd 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -71,12 +71,12 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner 
*pFlowOutl, SdrOutliner *p
 {
 bool bOldUpdateMode = pFlowOutl->GetUpdateMode();
 
-// XXX: This could be reorganized moving most of this stuff inside 
EditingTextChainFlow (we need update=true anyway for TextChainFlow though)
+// We need this since it's required to check overflow
+pFlowOutl->SetUpdateMode(true);
+
+// XXX: This could be reorganized moving most of this stuff inside 
EditingTextChainFlow
 if (pParamOutl != NULL)
 {
-// We need this since it's required to check overflow
-pFlowOutl->SetUpdateMode(true);
-
 // XXX: does this work if you do it before setting the text? Seems so.
 impSetFlowOutlinerParams(pFlowOutl, pParamOutl);
 }
@@ -87,10 +87,9 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner 
*pFlowOutl, SdrOutliner *p
 bOverflow = bIsPageOverflow && mpNextLink;
 bUnderflow = !bIsPageOverflow &&  mpNextLink && mpNextLink->HasText();
 
-if (pParamOutl != NULL)
-{
-pFlowOutl->SetUpdateMode(bOldUpdateMode);
-}
+// Reset update mode
+pFlowOutl->SetUpdateMode(bOldUpdateMode);
+
 
 // Get old state on whether to merge para-s or not
 // NOTE: We handle UF/OF using the _old_ state. The new one is simply saved
commit 4ad93ff450e53263a32dff01239aacd876e81e28
Author: matteocam 
Date:   Tue Aug 18 14:18:59 2015 +0200

Minor changes

Change-Id: Ife0861db9249dab3102399365ca965ca53b34e42

diff --git a/svx/source/svdraw/textchainflow.cxx 
b/svx/source/svdraw/textchainflow.cxx
index 94fac05..d74e441 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -244,10 +244,12 @@ SdrTextObj *TextChainFlow::GetNextLink() const
 return mpNextLink;
 }
 
-OutlinerParaObject *TextChainFlow::impGetOverflowingParaObject(SdrOutliner 
*pOutliner)
-{
-return mpOverflChText->CreateOverflowingParaObject(pOutliner,
-  
mpNextLink->GetOutlinerParaObject());
+OutlinerParaObject *TextChainFlow::impGetOverflowingParaObject(SdrOutliner *)
+{   // XXX: Should never be called (to be deleted)
+assert(0);
+return NULL;
+//return mpOverflChText->CreateOverflowingParaObject(pOutliner,
+//  
mp

Re: Have serf layer in webdav built again: cannot link libucpdav1.so

[Giuseppe Castagno]

Hi Michael,

On 08/18/2015 01:45 PM, Michael Stahl wrote:

On 03.08.2015 09:51, Giuseppe Castagno wrote:

Building serf webdav I hit the following problem:

I have problem linking libucpdav1.so:
/srv5/git/LibO/lo-serf-study/workdir/UnpackedTarball/apr/.libs/libapr-1.a(rand.o):
In function `apr_os_uuid_get':
/srv5/git/LibO/lo-serf-study/workdir/UnpackedTarball/apr/misc/unix/rand.c:75:
undefined reference to `uuid_generate'

this should mean -luuid (hence libuuid from host OS) is missing, but I
could not figure out a way to edit the file ucb/Library_ucpdav1.mk in
order to link successfully


i believe this problem was resolved by Stephan with commit
aeafca133405e4a5fdbe253f8dcd2019d6b6b2a4


When I was able to link & test I forgot to acknowledge the answer :-).
tnx

--
Kind Regards,
Giuseppe Castagno aka beppec56
Acca Esse http://www.acca-esse.eu
giuseppe.castagno at acca-esse.eu
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source unotools/source

[Stephan Bergmann]

 include/ucbhelper/fileidentifierconverter.hxx   |   14 --
 ucbhelper/source/client/fileidentifierconverter.cxx |   18 --
 unotools/source/ucbhelper/localfilehelper.cxx   |6 ++
 3 files changed, 2 insertions(+), 36 deletions(-)

New commits:
commit 1242a3a55ffb8c5716d0a6f2e17dadc1f2c02818
Author: Stephan Bergmann 
Date:   Tue Aug 18 14:19:30 2015 +0200

Remove obsolete getLocalFileURL

...vnd.sun.star.wfs is long gone

Change-Id: I64da15a6c16e429aeda57c435e353891fb28f04d

diff --git a/include/ucbhelper/fileidentifierconverter.hxx 
b/include/ucbhelper/fileidentifierconverter.hxx
index d2ace14..27e7c8e 100644
--- a/include/ucbhelper/fileidentifierconverter.hxx
+++ b/include/ucbhelper/fileidentifierconverter.hxx
@@ -31,20 +31,6 @@ namespace com { namespace sun { namespace star { namespace 
ucb {
 
 namespace ucbhelper {
 
-
-/** Get a 'root' URL for the most 'local' file content provider.
-
-@descr
-The result can be used as the rBaseURL parameter of
-ucb::getFileURLFromSystemPath().
-
-@returns
-either a 'root' URL for the most 'local' file content provider, or an
-empty string, if no such URL can meaningfully be constructed.
- */
-UCBHELPER_DLLPUBLIC OUString getLocalFileURL();
-
-
 /** Using a specific content provider manager, convert a file path in system
 dependent notation to a (file) URL.
 
diff --git a/ucbhelper/source/client/fileidentifierconverter.cxx 
b/ucbhelper/source/client/fileidentifierconverter.cxx
index e3f3ec9..4916975 100644
--- a/ucbhelper/source/client/fileidentifierconverter.cxx
+++ b/ucbhelper/source/client/fileidentifierconverter.cxx
@@ -31,24 +31,6 @@ using namespace com::sun::star;
 
 namespace ucbhelper {
 
-
-
-//  getLocalFileURL
-
-
-
-OUString
-getLocalFileURL()
-{
-// If there were more file systems than just "file:///" (e.g., the obsolete
-// "vnd.sun.star.wfs:///"), this code should query all relevant UCPs for
-// their com.sun.star.ucb.XFileIdentifierConverter.getFileProviderLocality
-// and return the most local one:
-return OUString("file:///");
-}
-
-
-
 //  getFileURLFromSystemPath
 
 
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx 
b/unotools/source/ucbhelper/localfilehelper.cxx
index b459769..d5ff1e4 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.cxx
@@ -82,8 +82,7 @@ bool LocalFileHelper::ConvertPhysicalNameToURL(const 
OUString& rName, OUString&
 comphelper::getProcessComponentContext() ) );
 try
 {
-OUString aBase( ::ucbhelper::getLocalFileURL() );
-rReturn = ::ucbhelper::getFileURLFromSystemPath( pBroker, aBase, rName 
);
+rReturn = ::ucbhelper::getFileURLFromSystemPath( pBroker, "file:///", 
rName );
 }
 catch (const ::com::sun::star::uno::RuntimeException&)
 {
@@ -101,8 +100,7 @@ bool LocalFileHelper::ConvertURLToPhysicalName(const 
OUString& rName, OUString&
 try
 {
 INetURLObject aObj( rName );
-INetURLObject aLocal( ::ucbhelper::getLocalFileURL() );
-if ( aObj.GetProtocol() == aLocal.GetProtocol() )
+if ( aObj.GetProtocol() == INetProtocol::File )
 rReturn = ::ucbhelper::getSystemPathFromFileURL( pBroker, rName );
 }
 catch (const ::com::sun::star::uno::RuntimeException&)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basic/source

[Laurent Godard]

 basic/source/classes/image.cxx |  103 +
 1 file changed, 53 insertions(+), 50 deletions(-)

New commits:
commit 6e403346634113f7b5d582774864baa4555b2843
Author: Laurent Godard 
Date:   Tue Aug 18 13:40:42 2015 +0200

null pointer guard if no user defined types declared at the module level

Change-Id: I368a168c636e4029e9cd9bbe4a4df5d9b846c923
Reviewed-on: https://gerrit.libreoffice.org/17834
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index bc6fa3a..ef468dc 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -443,79 +443,82 @@ bool SbiImage::Save( SvStream& r, sal_uInt32 nVer )
 SbiCloseRecord( r, nPos );
 }
 // User defined types
-sal_uInt16 nTypes = rTypes->Count();
-if (nTypes > 0 )
+if (rTypes)
 {
-nPos = SbiOpenRecord( r, B_SBXOBJECTS, nTypes );
-
-for (sal_uInt16 i = 0; i < nTypes; i++)
+sal_uInt16 nTypes = rTypes->Count();
+if (nTypes > 0 )
 {
-SbxObject* pType = static_cast< SbxObject* > ( rTypes->Get(i) );
-OUString aTypeName = pType->GetClassName();
+nPos = SbiOpenRecord( r, B_SBXOBJECTS, nTypes );
 
-r.WriteUniOrByteString( aTypeName, eCharSet );
+for (sal_uInt16 i = 0; i < nTypes; i++)
+{
+SbxObject* pType = static_cast< SbxObject* > ( rTypes->Get(i) 
);
+OUString aTypeName = pType->GetClassName();
 
-SbxArray  *pTypeMembers = pType->GetProperties();
-sal_uInt16 nTypeMembers = pTypeMembers->Count();
+r.WriteUniOrByteString( aTypeName, eCharSet );
 
-r.WriteInt16(nTypeMembers);
+SbxArray  *pTypeMembers = pType->GetProperties();
+sal_uInt16 nTypeMembers = pTypeMembers->Count();
 
-for (sal_uInt16 j = 0; j < nTypeMembers; j++)
-{
+r.WriteInt16(nTypeMembers);
 
-SbxProperty* pTypeElem = static_cast< SbxProperty* > ( 
pTypeMembers->Get(j) );
+for (sal_uInt16 j = 0; j < nTypeMembers; j++)
+{
 
-OUString aElemName = pTypeElem->GetName();
-r.WriteUniOrByteString( aElemName, eCharSet );
+SbxProperty* pTypeElem = static_cast< SbxProperty* > ( 
pTypeMembers->Get(j) );
 
-SbxDataType dataType =   pTypeElem->GetType();
-r.WriteInt16(dataType);
+OUString aElemName = pTypeElem->GetName();
+r.WriteUniOrByteString( aElemName, eCharSet );
 
-SbxFlagBits nElemFlags = pTypeElem->GetFlags();
-r.WriteUInt32(static_cast< sal_uInt32 > (nElemFlags) );
+SbxDataType dataType =   pTypeElem->GetType();
+r.WriteInt16(dataType);
 
-SbxBase* pElemObject = pTypeElem->GetObject();
+SbxFlagBits nElemFlags = pTypeElem->GetFlags();
+r.WriteUInt32(static_cast< sal_uInt32 > (nElemFlags) );
 
-if (pElemObject)
-{
-r.WriteInt16(1); // has elem Object
+SbxBase* pElemObject = pTypeElem->GetObject();
 
-if( dataType == SbxOBJECT )
+if (pElemObject)
 {
-// nested user defined types
-// declared before use, so it is ok to reference it by 
name on load
-SbxObject* pNestedType = static_cast< SbxObject* > ( 
pElemObject );
-r.WriteUniOrByteString( pNestedType->GetClassName(), 
eCharSet );
-}
-else
-{
-// an array
-SbxDimArray* pArray = static_cast< SbxDimArray* > ( 
pElemObject );
+r.WriteInt16(1); // has elem Object
 
-bool bFixedSize = pArray->hasFixedSize();
-if (bFixedSize)
-r.WriteInt16(1);
+if( dataType == SbxOBJECT )
+{
+// nested user defined types
+// declared before use, so it is ok to reference 
it by name on load
+SbxObject* pNestedType = static_cast< SbxObject* > 
( pElemObject );
+r.WriteUniOrByteString( 
pNestedType->GetClassName(), eCharSet );
+}
 else
-r.WriteInt16(0);
+{
+// an array
+SbxDimArray* pArray = static_cast< SbxDimArray* > 
( pElemObject );
 
-sal_Int32 nDims = pArray->GetDims()

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source

[Miklos Vajna]

 sw/source/core/view/viewsh.cxx |   20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)

New commits:
commit a56cda359b45a900d0b5d017693efccf3b5b2e59
Author: Miklos Vajna 
Date:   Tue Aug 18 09:59:46 2015 +0200

tdf#93096 sw: fix selection with keyboard outside current view

Regression from commit c9175a1bd3249ad573ae6827bf19963a3ebe2fbc
(SwViewShell::ImplEndAction: avoid direct PaintDesktop(), 2015-07-03),
the problem is that while going via InvalidateWindows() is fine for the
double-buffering case, it has side effects when painting directly, so
revert back to the old code in that case.

Change-Id: Ib1e3b143f5cfe2c6ab8b102a1a2064900282f136
(cherry picked from commit 222f10e773ba51a19880be1b798990260c198147)
Reviewed-on: https://gerrit.libreoffice.org/17835
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 9cb6941..1b4b80d 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -405,7 +405,25 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd )
 }
 if ( bPaint )
 {
-InvalidateWindows(aRect.SVRect());
+if (GetWin() && GetWin()->SupportsDoubleBuffering())
+InvalidateWindows(aRect.SVRect());
+else
+{
+// #i75172# begin DrawingLayer paint
+// need to do begin/end DrawingLayer preparation 
for each single rectangle of the
+// repaint region. I already tried to prepare only 
once for the whole Region. This
+// seems to work (and does technically) but fails 
with transparent objects. Since the
+// region given to BeginDarwLayers() defines the 
clip region for DrawingLayer paint,
+// transparent objects in the single rectangles 
will indeed be painted multiple times.
+DLPrePaint2(vcl::Region(aRect.SVRect()));
+
+if ( bPaintsFromSystem )
+PaintDesktop(*GetOut(), aRect);
+
pCurrentLayout->GetCurrShell()->InvalidateWindows(aRect.SVRect());
+
+// #i75172# end DrawingLayer paint
+DLPostPaint2(true);
+}
 }
 else
 lcl_PaintTransparentFormControls(*this, aRect); // 
i#107365
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source

[Szymon Kłos]

 svx/source/dialog/imapdlg.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit b28a2cb6823eeb9fefaa3432858fb3319e8b8bb3
Author: Szymon Kłos 
Date:   Fri Aug 14 11:38:17 2015 +0200

resolved: crash while closing ImageMap Editor

Steps to reproduce crash:
1) Open Writer
2) Insert an image
3) Open ImageMap Editor (Edit > ImageMap)
4) Close window

Change-Id: I5f48345eb8ae8d2d1465082243348a8b2e8ccecf
Reviewed-on: https://gerrit.libreoffice.org/17754
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 5cb34bb..4b0af96 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -220,6 +220,8 @@ SvxIMapDlg::~SvxIMapDlg()
 
 void SvxIMapDlg::dispose()
 {
+pIMapWnd->SetUpdateLink( Link<>() );
+
 // Delete URL-List
 pIMapWnd.disposeAndClear();
 DELETEZ( pOwnData );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/inc/document.hxx |   15 ---
 sc/source/core/data/bcaslot.cxx |   23 +++
 sc/source/core/data/documen2.cxx|2 +-
 sc/source/core/data/documen7.cxx|8 
 sc/source/core/data/document.cxx|   10 --
 sc/source/core/data/formulacell.cxx |8 
 sc/source/core/inc/bcaslot.hxx  |6 +++---
 sc/source/ui/docshell/docsh.cxx |   12 +++-
 sc/source/ui/docshell/docsh4.cxx|2 +-
 9 files changed, 47 insertions(+), 39 deletions(-)

New commits:
commit 1bea8310747b65516f40f6457ab1d174ef7ddce4
Author: Eike Rathke 
Date:   Tue Aug 18 13:54:32 2015 +0200

introduce temporary hard-recalc state, tdf#92749 follow-up

This allows listeners to be setup and initial lookup caches to be kept,
which were thrown away after the initial calculation as an interim fix
for tdf#92749.

Change-Id: I34068b3f6b833a46f3c526579efbdc342a2e71df

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index aa1664a..a2b7800 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -275,6 +275,15 @@ friend class sc::EditTextIterator;
 friend class sc::FormulaGroupAreaListener;
 
 typedef ::std::vector TableContainer;
+
+public:
+enum HardRecalcState
+{
+HARDRECALCSTATE_OFF = 0,/// normal calculation of dependencies
+HARDRECALCSTATE_TEMPORARY,  /// CalcAll() without broadcast/notify but 
setting up new listeners
+HARDRECALCSTATE_ETERNAL /// no new listeners are setup, no 
broadcast/notify
+};
+
 private:
 
 rtl::Reference xPoolHelper;
@@ -391,7 +400,7 @@ private:
 sal_uInt16  nSrcVer;// file version 
(load/save)
 SCROW   nSrcMaxRow; // number of lines to 
load/save
 sal_uInt16  nFormulaTrackCount;
-boolbHardRecalcState;   // false: soft, true: 
hard
+HardRecalcState eHardRecalcState;   // off, temporary, 
eternal
 SCTAB   nVisibleTab;// for OLE etc., don't 
use inside ScDocument
 
 ScLkUpdMode eLinkMode;
@@ -1949,8 +1958,8 @@ public:
 voidTrackFormulas( sal_uLong nHintId = SC_HINT_DATACHANGED 
);
 boolIsInFormulaTree( ScFormulaCell* pCell ) const;
 boolIsInFormulaTrack( ScFormulaCell* pCell ) const;
-boolGetHardRecalcState() { return bHardRecalcState; }
-voidSetHardRecalcState( bool bVal ) { bHardRecalcState = 
bVal; }
+HardRecalcState GetHardRecalcState() { return eHardRecalcState; }
+voidSetHardRecalcState( HardRecalcState eVal ) { 
eHardRecalcState = eVal; }
 voidStartAllListeners();
 voidStartNeededListeners();
 voidStartAllListeners( const ScRange& rRange );
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index f9d6a19..6ae65c7 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -166,14 +166,13 @@ ScBroadcastAreaSlot::~ScBroadcastAreaSlot()
 }
 }
 
-bool ScBroadcastAreaSlot::CheckHardRecalcStateCondition() const
+ScDocument::HardRecalcState 
ScBroadcastAreaSlot::CheckHardRecalcStateCondition() const
 {
-if ( pDoc->GetHardRecalcState() )
-return true;
-if (aBroadcastAreaTbl.size() >= aBroadcastAreaTbl.max_size())
-{   // this is more hypothetical now, check existed for old SV_PTRARR_SORT
-if ( !pDoc->GetHardRecalcState() )
-{
+ScDocument::HardRecalcState eState = pDoc->GetHardRecalcState();
+if (eState == ScDocument::HARDRECALCSTATE_OFF)
+{
+if (aBroadcastAreaTbl.size() >= aBroadcastAreaTbl.max_size())
+{   // this is more hypothetical now, check existed for old 
SV_PTRARR_SORT
 SfxObjectShell* pShell = pDoc->GetDocumentShell();
 OSL_ENSURE( pShell, "Missing DocShell :-/" );
 
@@ -181,11 +180,11 @@ bool ScBroadcastAreaSlot::CheckHardRecalcStateCondition() 
const
 pShell->SetError( SCWARN_CORE_HARD_RECALC, OUString( 
OSL_LOG_PREFIX ) );
 
 pDoc->SetAutoCalc( false );
-pDoc->SetHardRecalcState( true );
+eState = ScDocument::HARDRECALCSTATE_ETERNAL;
+pDoc->SetHardRecalcState( eState );
 }
-return true;
 }
-return false;
+return eState;
 }
 
 bool ScBroadcastAreaSlot::StartListeningArea(
@@ -193,7 +192,7 @@ bool ScBroadcastAreaSlot::StartListeningArea(
 {
 bool bNewArea = false;
 OSL_ENSURE(pListener, "StartListeningArea: pListener Null");
-if (CheckHardRecalcStateCondition())
+if (CheckHardRecalcStateCondition() == ScDocument::HARDRECALCSTATE_ETERNAL)
 return false;
 if ( !rpArea )
 {
@@ -234,7 +233,7 @@ bool ScBroadcastAreaSlot::StartListeningArea(
 void ScBroadcastAreaSlot::InsertListeningArea( Sc

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - external/apr

[Stephan Bergmann]

 external/apr/UnpackedTarball_apr.mk |6 
 external/apr/uuid.patch |  241 
 2 files changed, 247 insertions(+)

New commits:
commit 78a7dfe3aeb8cb42fcc2a370b8ee4979a5560029
Author: Stephan Bergmann 
Date:   Mon Aug 17 12:01:18 2015 +0200

external/apr: Avoid dependency on system uuid lib

...which isn't even needed, as apr only uses APR_HAS_OS_UUID for 
apr_os_uuid_get
(apr_portable.h), which is neither used internally in apr nor by either of 
the
two clients of apr in LO, external/serf and ucb/source/ucp/webdav

Change-Id: I2e9d1f2640df0a8125ae2840f54488e77656c3ec
(cherry picked from commit aeafca133405e4a5fdbe253f8dcd2019d6b6b2a4)
Signed-off-by: Michael Stahl 

diff --git a/external/apr/UnpackedTarball_apr.mk 
b/external/apr/UnpackedTarball_apr.mk
index 5fa9d05..5f82b84 100644
--- a/external/apr/UnpackedTarball_apr.mk
+++ b/external/apr/UnpackedTarball_apr.mk
@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,apr))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,apr,$(APR_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,apr,0))
+
+$(eval $(call gb_UnpackedTarball_add_patches,apr, \
+external/apr/uuid.patch \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/apr/uuid.patch b/external/apr/uuid.patch
new file mode 100644
index 000..53c75f1
--- /dev/null
+++ b/external/apr/uuid.patch
@@ -0,0 +1,241 @@
+--- configure
 configure
+@@ -26343,235 +26343,9 @@
+ 
+ echo "${nl}Checking for OS UUID Support..."
+ 
+-for ac_header in uuid.h uuid/uuid.h sys/uuid.h
+-do :
+-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" 
"$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+- break
+-fi
+-
+-done
+-
+-
+-apr_revert_save_LIBS=$LIBS
+-
+-# Prefer the flavor(s) that live in libc;
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing 
uuid_create" >&5
+-$as_echo_n "checking for library containing uuid_create... " >&6; }
+-if ${ac_cv_search_uuid_create+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_func_search_save_LIBS=$LIBS
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char uuid_create ();
+-int
+-main ()
+-{
+-return uuid_create ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-for ac_lib in '' uuid; do
+-  if test -z "$ac_lib"; then
+-ac_res="none required"
+-  else
+-ac_res=-l$ac_lib
+-LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-  fi
+-  if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_search_uuid_create=$ac_res
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-conftest$ac_exeext
+-  if ${ac_cv_search_uuid_create+:} false; then :
+-  break
+-fi
+-done
+-if ${ac_cv_search_uuid_create+:} false; then :
+-
+-else
+-  ac_cv_search_uuid_create=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_uuid_create" 
>&5
+-$as_echo "$ac_cv_search_uuid_create" >&6; }
+-ac_res=$ac_cv_search_uuid_create
+-if test "$ac_res" != no; then :
+-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing 
uuid_generate" >&5
+-$as_echo_n "checking for library containing uuid_generate... " >&6; }
+-if ${ac_cv_search_uuid_generate+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_func_search_save_LIBS=$LIBS
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char uuid_generate ();
+-int
+-main ()
+-{
+-return uuid_generate ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-for ac_lib in '' uuid; do
+-  if test -z "$ac_lib"; then
+-ac_res="none required"
+-  else
+-ac_res=-l$ac_lib
+-LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-  fi
+-  if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_search_uuid_generate=$ac_res
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-conftest$ac_exeext
+-  if ${ac_cv_search_uuid_generate+:} false; then :
+-  break
+-fi
+-done
+-if ${ac_cv_search_uuid_generate+:} false; then :
+-
+-else
+-  ac_cv_search_uuid_generate=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_uuid_generate" 
>&5
+-$as_echo "$ac_cv_search_uuid_generate" >&6; }
+-ac_res=$ac_cv_search_uuid_gener

Re: Have serf layer in webdav built again: cannot link libucpdav1.so

[Michael Stahl]

On 03.08.2015 09:51, Giuseppe Castagno wrote:
> Building serf webdav I hit the following problem:
> 
> I have problem linking libucpdav1.so:
> /srv5/git/LibO/lo-serf-study/workdir/UnpackedTarball/apr/.libs/libapr-1.a(rand.o):
>  
> In function `apr_os_uuid_get':
> /srv5/git/LibO/lo-serf-study/workdir/UnpackedTarball/apr/misc/unix/rand.c:75: 
> undefined reference to `uuid_generate'
> 
> this should mean -luuid (hence libuuid from host OS) is missing, but I
> could not figure out a way to edit the file ucb/Library_ucpdav1.mk in
> order to link successfully

i believe this problem was resolved by Stephan with commit
aeafca133405e4a5fdbe253f8dcd2019d6b6b2a4


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source

[Eike Rathke]

 sc/source/core/data/document.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 78c988f3ebbcd84832ca671dfed16ce1664f3bfe
Author: Eike Rathke 
Date:   Tue Aug 18 11:33:44 2015 +0200

Resolves: tdf#92749 invalidate lookup caches after initial hard recalc

... because the caches are not setup as listeners during when the
document's hard recalc state is active.

Change-Id: Ie7ec84ee64d046e3e55ce26b92824e94a2f660e9
(cherry picked from commit f7e493229bd949066b4d8984dce7678b8687d1ae)
Reviewed-on: https://gerrit.libreoffice.org/17832
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 59fef65..8c26dd8 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3752,6 +3752,14 @@ void ScDocument::CalcAll()
 if (*it)
 (*it)->CalcAll();
 ClearFormulaTree();
+
+// In hard recalc state caches were not added as listeners, invalidate them
+// so the next non-CalcAll() normal lookup will not be presented with
+// outdated data.
+/* TODO: come up with more detailed hard recalc states so we can
+ * differentiate between hard recalc after load and others. */
+if (GetHardRecalcState())
+ClearLookupCaches();
 }
 
 void ScDocument::CompileAll()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source

[Eike Rathke]

 sc/source/core/data/document.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 6855a8a9a7d44be5a020ef609536b76c2dfe05d2
Author: Eike Rathke 
Date:   Tue Aug 18 11:33:44 2015 +0200

Resolves: tdf#92749 invalidate lookup caches after initial hard recalc

... because the caches are not setup as listeners during when the
document's hard recalc state is active.

Change-Id: Ie7ec84ee64d046e3e55ce26b92824e94a2f660e9
(cherry picked from commit f7e493229bd949066b4d8984dce7678b8687d1ae)
Reviewed-on: https://gerrit.libreoffice.org/17829
Reviewed-by: Norbert Thiebaud 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index e00a5cc..153b77f 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3780,6 +3780,14 @@ void ScDocument::CalcAll()
 if (*it)
 (*it)->CalcAll();
 ClearFormulaTree();
+
+// In hard recalc state caches were not added as listeners, invalidate them
+// so the next non-CalcAll() normal lookup will not be presented with
+// outdated data.
+/* TODO: come up with more detailed hard recalc states so we can
+ * differentiate between hard recalc after load and others. */
+if (GetHardRecalcState())
+ClearLookupCaches();
 }
 
 void ScDocument::CompileAll()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basic/source

[Laurent Godard]

 basic/source/classes/image.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit ba5fd0cc77d7d53004f46e4ca867a22d56c5baa7
Author: Laurent Godard 
Date:   Tue Aug 18 11:59:06 2015 +0200

correct wrong comments

Change-Id: I6682248873bcd6302b1d8d041bbc2e19a8e0ba7b
Reviewed-on: https://gerrit.libreoffice.org/17831
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index fa4feac..bc6fa3a 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -278,7 +278,6 @@ bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
 {
 // nested user defined types
 // declared before use, so it is ok to 
reference it by name on load
-// nested types not structuraly compatible 
with arrays at the moment
 OUString aNestedTypeName = 
r.ReadUniOrByteString(eCharSet);
 SbxObject* pNestedTypeObj = static_cast< 
SbxObject* >( rTypes->Find( aNestedTypeName, SbxCLASS_OBJECT ) );
 if (pNestedTypeObj)
@@ -290,7 +289,6 @@ bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
 else
 {
 // an array
-// not compatible with nested user defined 
types at the moment
 SbxDimArray* pArray = new SbxDimArray();
 
 sal_Int16 isFixedSize;
@@ -486,14 +484,12 @@ bool SbiImage::Save( SvStream& r, sal_uInt32 nVer )
 {
 // nested user defined types
 // declared before use, so it is ok to reference it by 
name on load
-// not compatible with arrays at the moment
 SbxObject* pNestedType = static_cast< SbxObject* > ( 
pElemObject );
 r.WriteUniOrByteString( pNestedType->GetClassName(), 
eCharSet );
 }
 else
 {
 // an array
-// not compatible with nested user defined types at 
the moment
 SbxDimArray* pArray = static_cast< SbxDimArray* > ( 
pElemObject );
 
 bool bFixedSize = pArray->hasFixedSize();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - include/oox oox/source

[Sushil Shinde]

 include/oox/export/shapes.hxx |1 +
 oox/source/export/shapes.cxx  |   15 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 21750ee2e7c8d29e48abe33eaa2f11ffb2f5976e
Author: Sushil Shinde 
Date:   Tue Mar 3 19:14:25 2015 +0530

tdf#89806 : Fixed background fill export for table cell.

  1. Table cell properties were exproted empty if file
 saved as .pptx file.
  2. Now added code to export table cell fill properties
 in 'tcPr'(Table cell properties xml tag)

Reviewed-on: https://gerrit.libreoffice.org/14734
Tested-by: Jenkins 
Reviewed-by: David Tardon 
Tested-by: David Tardon 
(cherry picked from commit 63442ec636d637e05d7d585817df531dbbeb96d9)

Conflicts:
sd/qa/unit/export-tests.cxx

Change-Id: Ica6005a65c7eefb8629c808f2a54764f98badb11

diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx
index 6403aec..dd70c38 100644
--- a/include/oox/export/shapes.hxx
+++ b/include/oox/export/shapes.hxx
@@ -160,6 +160,7 @@ public:
 
 void WriteTable( ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape > rXShape );
 
+void WriteTableCellProperties(::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet > rXPropSet);
 
 sal_Int32 GetNewShapeID( const ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape > rShape );
 sal_Int32 GetNewShapeID( const ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape > rShape, ::oox::core::XmlFilterBase* pFB );
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 3526636..9a170f1 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -890,7 +890,9 @@ void ShapeExport::WriteTable( Reference< XShape > rXShape  )
 
 WriteTextBox( xCell, XML_a );
 
-mpFS->singleElementNS( XML_a, XML_tcPr, FSEND );
+Reference< XPropertySet > xCellPropSet(xCell, 
UNO_QUERY_THROW);
+WriteTableCellProperties(xCellPropSet);
+
 mpFS->endElementNS( XML_a, XML_tc );
 }
 }
@@ -905,6 +907,17 @@ void ShapeExport::WriteTable( Reference< XShape > rXShape  
)
 mpFS->endElementNS( XML_a, XML_graphic );
 }
 
+void ShapeExport::WriteTableCellProperties(Reference< XPropertySet> 
xCellPropSet)
+{
+mpFS->startElementNS( XML_a, XML_tcPr, FSEND );
+// Write background fill for table cell.
+DrawingML::WriteFill(xCellPropSet);
+// TODO
+// tcW : Table cell width
+// tcBorders : Table cell border values.
+mpFS->endElementNS( XML_a, XML_tcPr );
+}
+
 ShapeExport& ShapeExport::WriteTableShape( Reference< XShape > xShape )
 {
 FSHelperPtr pFS = GetFS();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - svl/source

[Stephan Bergmann]

 svl/source/numbers/zforlist.cxx |  253 
 1 file changed, 128 insertions(+), 125 deletions(-)

New commits:
commit c77e74747b289990d45fb9378323daf63c9f7a2f
Author: Stephan Bergmann 
Date:   Tue Aug 18 13:16:23 2015 +0200

Content of theIndexTable is known statically

...and initializing it on-demand in SvNumberFormatter::ImpGenerateFormats 
wasn't
even thread safe (despite theIndexTable.maMtx):  While one thread was 
cleaning
and then filling it in ImpGenerateFormats, another thread could also enter
ImpGenerateFormats and clean it again (and only later fill it), and the 
first
thread might use the half-filled table after it left ImpGenerateFormats but
before the second thread re-filled it.

Change-Id: Iba4e9d57519d2b288718b9cb2e6f7546ba2bd5df

diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 8f540bd..8b00985 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -90,19 +90,61 @@ using namespace ::std;
  * (old currency) is recognized as a date (#53155#). */
 #define UNKNOWN_SUBSTITUTE  LANGUAGE_ENGLISH_US
 
-struct IndexTable
-{
-bool mbInitialized;
-sal_uInt32 maData[NF_INDEX_TABLE_ENTRIES];
-osl::Mutex maMtx;
-
-IndexTable() : mbInitialized(false) {}
+static sal_uInt32 const indexTable[NF_INDEX_TABLE_ENTRIES] = {
+ZF_STANDARD, // NF_NUMBER_STANDARD
+ZF_STANDARD + 1, // NF_NUMBER_INT
+ZF_STANDARD + 2, // NF_NUMBER_DEC2
+ZF_STANDARD + 3, // NF_NUMBER_1000INT
+ZF_STANDARD + 4, // NF_NUMBER_1000DEC2
+ZF_STANDARD + 5, // NF_NUMBER_SYSTEM
+ZF_STANDARD_SCIENTIFIC, // NF_SCIENTIFIC_000E000
+ZF_STANDARD_SCIENTIFIC + 1, // NF_SCIENTIFIC_000E00
+ZF_STANDARD_PERCENT, // NF_PERCENT_INT
+ZF_STANDARD_PERCENT + 1, // NF_PERCENT_DEC2
+ZF_STANDARD_FRACTION, // NF_FRACTION_1
+ZF_STANDARD_FRACTION + 1, // NF_FRACTION_2
+ZF_STANDARD_CURRENCY, // NF_CURRENCY_1000INT
+ZF_STANDARD_CURRENCY + 1, // NF_CURRENCY_1000DEC2
+ZF_STANDARD_CURRENCY + 2, // NF_CURRENCY_1000INT_RED
+ZF_STANDARD_CURRENCY + 3, // NF_CURRENCY_1000DEC2_RED
+ZF_STANDARD_CURRENCY + 4, // NF_CURRENCY_1000DEC2_CCC
+ZF_STANDARD_CURRENCY + 5, // NF_CURRENCY_1000DEC2_DASHED
+ZF_STANDARD_DATE, // NF_DATE_SYSTEM_SHORT
+ZF_STANDARD_DATE + 8, // NF_DATE_SYSTEM_LONG
+ZF_STANDARD_DATE + 7, // NF_DATE_SYS_DDMMYY
+ZF_STANDARD_DATE + 6, // NF_DATE_SYS_DDMM
+ZF_STANDARD_DATE + 9, // NF_DATE_SYS_DMMMYY
+ZF_STANDARD_NEWEXTENDED_DATE_SYS_DMMM, // NF_DATE_SYS_DMMM
+ZF_STANDARD_NEWEXTENDED_DATE_DIN_DMMM, // NF_DATE_DIN_DMMM
+ZF_STANDARD_NEWEXTENDED_DATE_SYS_D, // NF_DATE_SYS_D
+ZF_STANDARD_NEWEXTENDED_DATE_DIN_D, // NF_DATE_DIN_D
+ZF_STANDARD_NEWEXTENDED_DATE_SYS_NNDMMMYY, // NF_DATE_SYS_NNDMMMYY
+ZF_STANDARD_DATE + 1, // NF_DATE_DEF_NNDDMMMYY
+ZF_STANDARD_NEWEXTENDED_DATE_SYS_NND, // NF_DATE_SYS_NND
+ZF_STANDARD_NEWEXTENDED_DATE_SYS_D, // 
NF_DATE_SYS_D
+ZF_STANDARD_NEWEXTENDED_DATE_DIN_MMDD, // NF_DATE_DIN_MMDD
+ZF_STANDARD_NEWEXTENDED_DATE_DIN_YYMMDD, // NF_DATE_DIN_YYMMDD
+ZF_STANDARD_NEWEXTENDED_DATE_DIN_MMDD, // NF_DATE_DIN_MMDD
+ZF_STANDARD_DATE + 2, // NF_DATE_SYS_MMYY
+ZF_STANDARD_DATE + 3, // NF_DATE_SYS_DDMMM
+ZF_STANDARD_DATE + 4, // NF_DATE_
+ZF_STANDARD_DATE + 5, // NF_DATE_QQJJ
+ZF_STANDARD_NEWEXTENDED_DATE_WW, // NF_DATE_WW
+ZF_STANDARD_TIME, // NF_TIME_HHMM
+ZF_STANDARD_TIME + 1, // NF_TIME_HHMMSS
+ZF_STANDARD_TIME + 2, // NF_TIME_HHMMAMPM
+ZF_STANDARD_TIME + 3, // NF_TIME_HHMMSSAMPM
+ZF_STANDARD_TIME + 4, // NF_TIME_HH_MMSS
+ZF_STANDARD_TIME + 5, // NF_TIME_MMSS00
+ZF_STANDARD_TIME + 6, // NF_TIME_HH_MMSS00
+ZF_STANDARD_DATETIME, // NF_DATETIME_SYSTEM_SHORT_HHMM
+ZF_STANDARD_DATETIME + 1, // NF_DATETIME_SYS_DDMM_HHMMSS
+ZF_STANDARD_LOGICAL, // NF_BOOLEAN
+ZF_STANDARD_TEXT, // NF_TEXT
+ZF_STANDARD_FRACTION + 2, // NF_FRACTION_3
+ZF_STANDARD_FRACTION + 3 // NF_FRACTION_4
 };
 
-static IndexTable theIndexTable;
-
-
-
 /**
 instead of every number formatter being a listener we have a registry which
 also handles one instance of the SysLocale options
@@ -1918,21 +1960,6 @@ sal_uInt32 SvNumberFormatter::GetFormatSpecialInfo( 
const OUString& rFormatStrin
 return nCheckPos;
 }
 
-
-inline sal_uInt32 SetIndexTable( NfIndexTableOffset nTabOff, sal_uInt32 
nIndOff )
-{
-osl::MutexGuard aGuard(&theIndexTable.maMtx);
-
-if (!theIndexTable.mbInitialized)
-{
-DBG_ASSERT(theIndexTable.maData[nTabOff] == 
NUMBERFORMAT_ENTRY_NOT_FOUND,
-"SetIndexTable: theIndexTable[nTabOff] already occupied" );
-theIndexTable.maData[nTabOff] = nIndOff;
-}
-return nIndOff;
-}
-
-
 sal_Int32 SvNumberFormatter::ImpGetFormatCodeIndex(
 ::com::sun::star::u

[Libreoffice-commits] core.git: config_host/config_python.h.in configure.ac pyuno/CustomTarget_python_shell.mk pyuno/CustomTarget_pyuno_pythonloader_ini.mk pyuno/Executable_python.mk pyuno/zipcore

[Michael Stahl]

 config_host/config_python.h.in   |8 
 configure.ac |4 +++-
 pyuno/CustomTarget_python_shell.mk   |3 ++-
 pyuno/CustomTarget_pyuno_pythonloader_ini.mk |1 +
 pyuno/Executable_python.mk   |4 
 pyuno/zipcore/python.cxx |   12 +++-
 6 files changed, 21 insertions(+), 11 deletions(-)

New commits:
commit aa93151b9a740582732a06578e04b558beb177c2
Author: Michael Stahl 
Date:   Mon Aug 17 23:52:10 2015 +0200

configure, pyuno: stop claiming our python 3.3.5 is 3.3.3

... and adapt makefiles to automatically rebuild everything that depends
on PYTHON_VERSION.

Change-Id: If468183e59463503051c2a1526a905dbee9bf4cb
Reviewed-on: https://gerrit.libreoffice.org/17818
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/config_host/config_python.h.in b/config_host/config_python.h.in
new file mode 100644
index 000..3258205
--- /dev/null
+++ b/config_host/config_python.h.in
@@ -0,0 +1,8 @@
+/* python stuff */
+
+#ifndef CONFIG_PYTHON_H
+#define CONFIG_PYTHON_H
+
+#undef PYTHON_VERSION_STRING
+
+#endif // CONFIG_PYTHON_H
diff --git a/configure.ac b/configure.ac
index c2f7dc6..5944d23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8106,7 +8106,8 @@ internal)
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=3
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.3
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.5
+AC_DEFINE_UNQUOTED([PYTHON_VERSION_STRING], [L"${PYTHON_VERSION}"])
 BUILD_TYPE="$BUILD_TYPE PYTHON"
 # Embedded Python dies without Home set
 if test "$HOME" = ""; then
@@ -13168,6 +13169,7 @@ AC_CONFIG_HEADERS([config_host/config_vclplug.h])
 AC_CONFIG_HEADERS([config_host/config_version.h])
 AC_CONFIG_HEADERS([config_host/config_oauth2.h])
 AC_CONFIG_HEADERS([config_host/config_poppler.h])
+AC_CONFIG_HEADERS([config_host/config_python.h])
 AC_OUTPUT
 
 if test "$CROSS_COMPILING" = TRUE; then
diff --git a/pyuno/CustomTarget_python_shell.mk 
b/pyuno/CustomTarget_python_shell.mk
index bc6d355..203258b 100644
--- a/pyuno/CustomTarget_python_shell.mk
+++ b/pyuno/CustomTarget_python_shell.mk
@@ -27,7 +27,8 @@ $(call 
gb_CustomTarget_get_workdir,pyuno/python_shell)/python.sh : \
cat $^ > $@ && chmod +x $@
 
 $(call gb_CustomTarget_get_workdir,pyuno/python_shell)/os.sh : \
-   $(SRCDIR)/pyuno/zipcore/$(if $(filter 
MACOSX,$(OS)),mac,nonmac).sh
+   $(SRCDIR)/pyuno/zipcore/$(if $(filter 
MACOSX,$(OS)),mac,nonmac).sh \
+   $(BUILDDIR)/config_$(gb_Side)/config_python.h
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
sed -e "s/%%PYVERSION%%/$(pyuno_PYTHON_SHELL_VERSION)/g" \
$< > $@
diff --git a/pyuno/CustomTarget_pyuno_pythonloader_ini.mk 
b/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
index 920a7a3..51cb35f 100644
--- a/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
+++ b/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
@@ -14,6 +14,7 @@ $(eval $(call 
gb_CustomTarget_register_targets,pyuno/pythonloader_ini, \
 ))
 
 $(call gb_CustomTarget_get_workdir,pyuno/pythonloader_ini)/$(call 
gb_Helper_get_rcfile,pythonloader.uno): \
+   $(BUILDDIR)/config_$(gb_Side)/config_python.h \
 $(SRCDIR)/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
(   printf '[Bootstrap]\n' && \
diff --git a/pyuno/Executable_python.mk b/pyuno/Executable_python.mk
index 2f96404..05220bc2 100644
--- a/pyuno/Executable_python.mk
+++ b/pyuno/Executable_python.mk
@@ -9,10 +9,6 @@
 
 $(eval $(call gb_Executable_Executable,python))
 
-$(eval $(call gb_Executable_add_defs,python,\
--DMY_PYVERSION=L\"$(PYTHON_VERSION)\" \
-))
-
 $(eval $(call gb_Executable_use_static_libraries,python,\
 ooopathutils \
 ))
diff --git a/pyuno/zipcore/python.cxx b/pyuno/zipcore/python.cxx
index 6944d93..239f315 100644
--- a/pyuno/zipcore/python.cxx
+++ b/pyuno/zipcore/python.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
 #include 
 #include 
 #include 
@@ -98,14 +100,14 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
 wchar_t pythonpath2[MAX_PATH];
 wchar_t * pythonpath2End = tools::buildPath(
 pythonpath2, path, pathEnd,
-MY_STRING(L"\\python-core-" MY_PYVERSION L"\\lib"));
+MY_STRING(L"\\python-core-" PYTHON_VERSION_STRING L"\\lib"));
 if (pythonpath2End == NULL) {
 exit(EXIT_FAILURE);
 }
 wchar_t pythonpath3[MAX_PATH];
 wchar_t * pythonpath3End = tools::buildPath(
 pythonpath3, path, pathEnd,
-MY_STRING(L"\\python-core-" MY_PYVERSION L"\\lib\\site-packages"));
+MY_STRING(L"\\python-core-" PYTHON_VERSION_STRING 
L"\\lib\\site-packages"));
 if (pythonpath3End == NULL) {
 exit

[Libreoffice-commits] core.git: Branch 'feature/vba-export' - oox/qa

[Markus Mohrhard]

 oox/qa/unit/data/vba/reference/spec321.bin |binary
 oox/qa/unit/data/vba/spec321.bin   |1 +
 oox/qa/unit/vba_compression.cxx|   27 ++-
 3 files changed, 27 insertions(+), 1 deletion(-)

New commits:
commit 40b8f4d7b23e3ab297cd6d006bba1ad6a081b2fa
Author: Markus Mohrhard 
Date:   Tue Aug 18 13:17:02 2015 +0200

add remaining test from spec for vba compression

That test is testing the case that a sequence can not be compressed at
all.

Change-Id: I98d1065919acc9688d713ea09bf578c325b1f821

diff --git a/oox/qa/unit/data/vba/reference/spec321.bin 
b/oox/qa/unit/data/vba/reference/spec321.bin
new file mode 100644
index 000..3120c7f
Binary files /dev/null and b/oox/qa/unit/data/vba/reference/spec321.bin differ
diff --git a/oox/qa/unit/data/vba/spec321.bin b/oox/qa/unit/data/vba/spec321.bin
new file mode 100644
index 000..c5d48c9
--- /dev/null
+++ b/oox/qa/unit/data/vba/spec321.bin
@@ -0,0 +1 @@
+abcdefghijklmnopqrstuv.
\ No newline at end of file
diff --git a/oox/qa/unit/vba_compression.cxx b/oox/qa/unit/vba_compression.cxx
index abf2b29..0247fb9 100644
--- a/oox/qa/unit/vba_compression.cxx
+++ b/oox/qa/unit/vba_compression.cxx
@@ -33,6 +33,8 @@ public:
 // tests taken from the VBA specification
 // section 3.2
 
+// section 3.2.1
+void testSpec321();
 // section 3.2.2
 void testSpec322();
 // section 3.2.3
@@ -47,6 +49,7 @@ public:
 CPPUNIT_TEST(testSimple2);
 CPPUNIT_TEST(testSimple3);
 CPPUNIT_TEST(testComplex1);
+CPPUNIT_TEST(testSpec321);
 CPPUNIT_TEST(testSpec322);
 CPPUNIT_TEST(testSpec323);
 CPPUNIT_TEST_SUITE_END();
@@ -166,6 +169,28 @@ void TestVbaCompression::testComplex1()
 }
 }
 
+void TestVbaCompression::testSpec321()
+{
+OUString aTestFile = getPathFromSrc("/oox/qa/unit/data/vba/spec321.bin");
+OUString aReference = 
getPathFromSrc("/oox/qa/unit/data/vba/reference/spec321.bin");
+
+SvMemoryStream aOutputMemoryStream(4096, 4096);
+SvMemoryStream aReferenceMemoryStream(4096, 4096);
+ReadFiles(aTestFile, aReference, aOutputMemoryStream, 
aReferenceMemoryStream, "/tmp/vba_debug_spec321.bin");
+
+CPPUNIT_ASSERT_EQUAL(aReferenceMemoryStream.GetSize(), 
aOutputMemoryStream.GetSize());
+
+const sal_uInt8* pReferenceData = (const sal_uInt8*) 
aReferenceMemoryStream.GetData();
+const sal_uInt8* pData = (const sal_uInt8*)aOutputMemoryStream.GetData();
+
+size_t nSize = std::min(aReferenceMemoryStream.GetSize(),
+aOutputMemoryStream.GetSize());
+for (size_t i = 0; i < nSize; ++i)
+{
+CPPUNIT_ASSERT_EQUAL((int)pReferenceData[i], (int)pData[i]);
+}
+}
+
 void TestVbaCompression::testSpec322()
 {
 OUString aTestFile = getPathFromSrc("/oox/qa/unit/data/vba/spec322.bin");
@@ -195,7 +220,7 @@ void TestVbaCompression::testSpec323()
 
 SvMemoryStream aOutputMemoryStream(4096, 4096);
 SvMemoryStream aReferenceMemoryStream(4096, 4096);
-ReadFiles(aTestFile, aReference, aOutputMemoryStream, 
aReferenceMemoryStream, "/tmp/vba_debug_spec321.bin");
+ReadFiles(aTestFile, aReference, aOutputMemoryStream, 
aReferenceMemoryStream, "/tmp/vba_debug_spec323.bin");
 
 CPPUNIT_ASSERT_EQUAL(aReferenceMemoryStream.GetSize(), 
aOutputMemoryStream.GetSize());
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svtools/source

[Caolán McNamara]

 svtools/source/contnr/foldertree.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f54f99febd25b1c86e77747764375a2e53f572c5
Author: Caolán McNamara 
Date:   Tue Aug 18 08:25:29 2015 +0100

coverity#1316521 Dereference null return value

Change-Id: I6ec19df7b84e3529ef00640560540fda445dc82e

diff --git a/svtools/source/contnr/foldertree.cxx 
b/svtools/source/contnr/foldertree.cxx
index bc86533..acf54ac 100644
--- a/svtools/source/contnr/foldertree.cxx
+++ b/svtools/source/contnr/foldertree.cxx
@@ -92,12 +92,12 @@ void FolderTree::FillTreeEntry( const OUString & rUrl, 
const ::std::vector< std:
 
 if( pParent && !IsExpanded( pParent ) )
 {
-while( GetChildCount( pParent ) > 0 )
+while (SvTreeListEntry* pChild = FirstChild(pParent))
 {
-SvTreeListEntry* pChild = FirstChild( pParent );
-GetModel()->Remove( pChild );
+GetModel()->Remove(pChild);
 }
 
+
 for(::std::vector< std::pair< OUString, OUString > >::const_iterator 
it = rFolders.begin(); it != rFolders.end() ; ++it)
 {
 SvTreeListEntry* pNewEntry = InsertEntry( it->first, pParent, true 
 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 2 commits - desktop/source include/LibreOfficeKit smoketest/libtest.cxx

[Michael Meeks]

 desktop/source/lib/init.cxx |  135 +---
 include/LibreOfficeKit/LibreOfficeKitInit.h |   60 +++-
 smoketest/libtest.cxx   |   24 
 3 files changed, 162 insertions(+), 57 deletions(-)

New commits:
commit a320a722439c14b7e6de88fd029e5236032cbda6
Author: Michael Meeks 
Date:   Tue Aug 18 12:10:05 2015 +0100

Stub initial pre-init phase.

Change-Id: I92d172a166606189ce386826eee566623ec4a83c

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 88a2f06..a435b7ef 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -42,6 +42,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include 
@@ -964,17 +966,69 @@ static void lo_status_indicator_callback(void *data, 
comphelper::LibreOfficeKit:
 }
 }
 
+/// pre-load all C++ component factories and leak references to them.
+static void forceLoadAllNativeComponents()
+{
+// FIXME: we need to inject RTLD_NOW into here, either by a
+// putenv("LD_BIND_NOW=1") in parent process or ... (?).
+
+try {
+uno::Reference xEnumAcc(
+xContext->getServiceManager(), css::uno::UNO_QUERY_THROW);
+uno::Reference xTypeMgr(
+xContext->getValueByName(
+
"/singletons/com.sun.star.reflection.theTypeDescriptionManager"),
+css::uno::UNO_QUERY_THROW);
+uno::Sequence aServiceNames(
+xContext->getServiceManager()->getAvailableServiceNames());
+
+for (sal_Int32 i = 0; i != aServiceNames.getLength(); ++i)
+{
+css::uno::Reference xServiceImpls(
+xEnumAcc->createContentEnumeration(aServiceNames[i]),
+css::uno::UNO_SET_THROW);
+SAL_INFO("lok", "service " << aServiceNames[i]);
+// FIXME: need to actually load and link each native DSO.
+}
+} catch (const uno::Exception &) {
+}
+}
+
+/// pre-load and parse all filter XML
+static void forceLoadFilterXML()
+{
+}
+
 static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const 
char* pUserProfilePath)
 {
+enum {
+PRE_INIT, // setup shared data in master process
+SECOND_INIT,  // complete init. after fork
+FULL_INIT // do a standard complete init.
+} eStage;
+
+// Did we do a pre-initialize
+static bool bPreInited = false;
+
+// What stage are we at ?
+if (pThis == NULL)
+eStage = PRE_INIT;
+else if (bPreInited)
+eStage = SECOND_INIT;
+else
+eStage = FULL_INIT;
+
 LibLibreOffice_Impl* pLib = static_cast(pThis);
 
 if (bInitialized)
 return 1;
 
-comphelper::LibreOfficeKit::setActive();
-
comphelper::LibreOfficeKit::setStatusIndicatorCallback(lo_status_indicator_callback,
 pLib);
+if (eStage != SECOND_INIT)
+comphelper::LibreOfficeKit::setActive();
+if (eStage != PRE_INIT)
+
comphelper::LibreOfficeKit::setStatusIndicatorCallback(lo_status_indicator_callback,
 pLib);
 
-if (pUserProfilePath)
+if (eStage != SECOND_INIT && pUserProfilePath)
 rtl::Bootstrap::set(OUString("UserInstallation"), 
OUString(pUserProfilePath, strlen(pUserProfilePath), RTL_TEXTENCODING_UTF8));
 
 OUString aAppPath;
@@ -997,22 +1051,30 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath, const char
 
 try
 {
-SAL_INFO("lok", "Attempting to initalize UNO");
-if (!initialize_uno(aAppURL))
+if (eStage != SECOND_INIT)
 {
-return false;
-}
-force_c_locale();
+SAL_INFO("lok", "Attempting to initalize UNO");
 
-// Force headless -- this is only for bitmap rendering.
-rtl::Bootstrap::set("SAL_USE_VCLPLUGIN", "svp");
+if (!initialize_uno(aAppURL))
+return false;
+force_c_locale();
 
-// We specifically need to make sure we have the "headless"
-// command arg set (various code specifically checks via
-// CommandLineArgs):
-desktop::Desktop::GetCommandLineArgs().setHeadless();
+// Force headless -- this is only for bitmap rendering.
+rtl::Bootstrap::set("SAL_USE_VCLPLUGIN", "svp");
 
-Application::EnableHeadlessMode(true);
+// We specifically need to make sure we have the "headless"
+// command arg set (various code specifically checks via
+// CommandLineArgs):
+desktop::Desktop::GetCommandLineArgs().setHeadless();
+
+Application::EnableHeadlessMode(true);
+}
+
+if (eStage == PRE_INIT)
+{
+forceLoadAllNativeComponents();
+forceLoadFilterXML();
+}
 
 // This is horrible crack. I really would want to go back to simply 
just call
 // InitVCL() here. The OfficeIPCThread thing is just horrible.
@@ -1033,27 +1095,34 @@ static int lo_initia

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source

[matteocam]

 editeng/source/outliner/overflowingtxt.cxx |   15 +++
 1 file changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 02739f1876f6d945823d5c4663e6b37f435f4a2f
Author: matteocam 
Date:   Tue Aug 18 12:54:16 2015 +0200

Assign return value of InsertText to EditSelection

Change-Id: I6e00e408ed84c4310e276de8e0b37b230748cc13

diff --git a/editeng/source/outliner/overflowingtxt.cxx 
b/editeng/source/outliner/overflowingtxt.cxx
index 3a97c89..3454aee 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -184,25 +184,30 @@ OutlinerParaObject 
*OverflowingText::JuxtaposeParaObject(Outliner *pOutl, Outlin
 // XXX: this code should be moved in Outliner directly
 //  creating Outliner::InsertText(...transferable...)
 EditSelection 
aStartSel(pOutl->pEditEngine->CreateSelection(ESelection(0,0)));
-EditPaM aPaM = pOutl->pEditEngine->InsertText(mxOverflowingContent,
+EditSelection aNewSel = 
pOutl->pEditEngine->InsertText(mxOverflowingContent,
   OUString(),
   aStartSel.Min(),
   true);
 
 // Separate Paragraphs
-pOutl->pEditEngine->InsertParaBreak(EditSelection(aPaM, aPaM));
+pOutl->pEditEngine->InsertParaBreak(aNewSel);
 
 return pOutl->CreateParaObject();
 }
 
-OutlinerParaObject *OverflowingText::impMakeOverflowingParaObject(Outliner 
*pOutliner)
+// XXX: This method should probably be removed
+OutlinerParaObject *OverflowingText::impMakeOverflowingParaObject(Outliner *)
 {
+/*
 // Simply Juxtaposing; no within-para merging
 OutlinerParaObject *pOverflowingPObj = new 
OutlinerParaObject(*mpContentTextObj);
 // the OutlinerParaObject constr. at the prev line gives no valid outliner 
mode, so we set it
 pOverflowingPObj->SetOutlinerMode(pOutliner->GetOutlinerMode());
 
 return pOverflowingPObj;
+*/
+assert(0); // Should not be called
+return NULL;
 }
 
 
@@ -218,7 +223,9 @@ OutlinerParaObject 
*OverflowingText::DeeplyMergeParaObject(Outliner *pOutl, Outl
 // XXX: this code should be moved in Outliner directly
 //  creating Outliner::InsertText(...transferable...)
 EditSelection 
aStartSel(pOutl->pEditEngine->CreateSelection(ESelection(0,0)));
-EditPaM aPaM = pOutl->pEditEngine->InsertText(mxOverflowingContent,
+// We don't need to mark the selection
+// EditSelection aNewSel =
+pOutl->pEditEngine->InsertText(mxOverflowingContent,
   OUString(),
   aStartSel.Min(),
   true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/fixes7' - vcl/win

[Tor Lillqvist]

 vcl/win/source/gdi/winlayout.cxx |   41 +--
 1 file changed, 23 insertions(+), 18 deletions(-)

New commits:
commit 35f9d5f84c7d1a5058a7908bc68a6f127471e82d
Author: Tor Lillqvist 
Date:   Tue Aug 18 13:43:27 2015 +0300

More hacking on OpenGL glyph caching on Windows

Now text looks better, for instance the lower-case "t" glyphs on the
Start Centre aren't totally weird any more. But for instance the tip
of the hook of "j" leaks into the "i" texture. I guess I really would
need to render glyphs one by one.

Change-Id: I69ae2d2f7c559530bcfdfc1a4915503fcb3ab4af

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index e32b8b5..0ab9cd9 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -204,7 +204,7 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, 
const WinLayout& rLayou
 if (nGlyphIndex == DROPPED_OUTGLYPH)
 return true;
 
-SAL_INFO("vcl.gdi.opengl", "AddChunkOfGlyphs " << this << " " << 
nGlyphIndex << " old: " << maOpenGLGlyphCache);
+SAL_INFO("vcl.gdi.opengl", "this=" << this << " " << nGlyphIndex << " old: 
" << maOpenGLGlyphCache);
 
 auto n = maOpenGLGlyphCache.begin();
 while (n != maOpenGLGlyphCache.end() &&
@@ -262,12 +262,32 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, 
const WinLayout& rLayou
 return false;
 }
 
+std::vector aABC(nCount);
+if (!GetCharABCWidthsI(hDC, 0, nCount, aGlyphIndices.data(), aABC.data()))
+{
+SAL_WARN("vcl.gdi", "GetCharABCWidthsI failed: " << 
WindowsErrorString(GetLastError()));
+return false;
+}
+
+for (int i = 0; i < nCount; i++)
+std::cerr << aABC[i].abcA << ":" << aABC[i].abcB << ":" << 
aABC[i].abcC << " ";
+std::cerr << std::endl;
+
+// Avoid kerning as we want to be able to use individual rectangles for 
each glyph
+std::vector aDX(nCount);
+int totWidth = 0;
+for (int i = 0; i < nCount; i++)
+{
+aDX[i] = std::abs(aABC[i].abcA) + aABC[i].abcB + 
std::abs(aABC[i].abcC);
+totWidth += aDX[i];
+}
+
 if (SelectObject(hDC, hOrigFont) == NULL)
 SAL_WARN("vcl.gdi", "SelectObject failed: " << 
WindowsErrorString(GetLastError()));
 if (!DeleteDC(hDC))
 SAL_WARN("vcl.gdi", "DeleteDC failed: " << 
WindowsErrorString(GetLastError()));
 
-OpenGLCompatibleDC aDC(rGraphics, 0, 0, aSize.cx, aSize.cy);
+OpenGLCompatibleDC aDC(rGraphics, 0, 0, totWidth, aSize.cy);
 
 hOrigFont = SelectFont(aDC.getCompatibleHDC(), rLayout.mhFont);
 if (hOrigFont == NULL)
@@ -279,21 +299,6 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, 
const WinLayout& rLayou
 SetTextColor(aDC.getCompatibleHDC(), RGB(0, 0, 0));
 SetBkColor(aDC.getCompatibleHDC(), RGB(255, 255, 255));
 
-std::vector aABC(nCount);
-if (!GetCharABCWidthsI(aDC.getCompatibleHDC(), 0, nCount, 
aGlyphIndices.data(), aABC.data()))
-{
-SAL_WARN("vcl.gdi", "GetCharABCWidthsI failed: " << 
WindowsErrorString(GetLastError()));
-return false;
-}
-
-for (int i = 0; i < nCount; i++)
-std::cerr << aABC[i].abcA << ":" << aABC[i].abcB << ":" << 
aABC[i].abcC << " ";
-std::cerr << std::endl;
-
-// Avoid kerning as we want to be able to use individual rectangles for 
each glyph
-std::vector aDX(nCount);
-for (int i = 0; i < nCount; i++)
-aDX[i] = std::abs(aABC[i].abcA) + aABC[i].abcB + 
std::abs(aABC[i].abcC);
 if (!ExtTextOutW(aDC.getCompatibleHDC(), 0, 0, ETO_GLYPH_INDEX, NULL, 
aGlyphIndices.data(), nCount, aDX.data()))
 {
 SAL_WARN("vcl.gdi", "ExtTextOutW failed: " << 
WindowsErrorString(GetLastError()));
@@ -317,7 +322,7 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, 
const WinLayout& rLayou
 
 SelectFont(aDC.getCompatibleHDC(), hOrigFont);
 
-SAL_INFO("vcl.gdi.opengl", "AddChunkOfGlyphs " << this << " now: " << 
maOpenGLGlyphCache << DumpGlyphBitmap(aChunk, aDC.getCompatibleHDC()));
+SAL_INFO("vcl.gdi.opengl", "this=" << this << " now: " << 
maOpenGLGlyphCache << DumpGlyphBitmap(aChunk, aDC.getCompatibleHDC()));
 
 return true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libmspub.git: src/lib

[David Tardon]

 src/lib/MSPUBParser2k.cpp |   33 -
 src/lib/MSPUBParser2k.h   |2 ++
 2 files changed, 34 insertions(+), 1 deletion(-)

New commits:
commit 98de8427131ba3203f38739a86c9af6e81367644
Author: David Tardon 
Date:   Tue Aug 18 12:13:54 2015 +0200

afl: avoid stack overflow

Change-Id: I920e3ef946e415aec3554fbb852d95f596e31405

diff --git a/src/lib/MSPUBParser2k.cpp b/src/lib/MSPUBParser2k.cpp
index 3f2aaf3..c0c7413 100644
--- a/src/lib/MSPUBParser2k.cpp
+++ b/src/lib/MSPUBParser2k.cpp
@@ -22,11 +22,35 @@
 namespace libmspub
 {
 
+namespace
+{
+
+class ChunkNestingGuard
+{
+public:
+  ChunkNestingGuard(std::deque &chunks, const unsigned seqNum)
+: m_chunks(chunks)
+  {
+m_chunks.push_front(seqNum);
+  }
+
+  ~ChunkNestingGuard()
+  {
+m_chunks.pop_front();
+  }
+
+private:
+  std::deque &m_chunks;
+};
+
+}
+
 MSPUBParser2k::MSPUBParser2k(librevenge::RVNGInputStream *input, 
MSPUBCollector *collector)
   : MSPUBParser(input, collector),
 m_imageDataChunkIndices(),
 m_quillColorEntries(),
-m_chunkChildIndicesById()
+m_chunkChildIndicesById(),
+m_chunksBeingRead()
 {
 }
 
@@ -479,6 +503,13 @@ void 
MSPUBParser2k::parseShapeRotation(librevenge::RVNGInputStream *input, bool
 bool MSPUBParser2k::parse2kShapeChunk(const ContentChunkReference &chunk, 
librevenge::RVNGInputStream *input,
   boost::optional pageSeqNum, 
bool topLevelCall)
 {
+  if (find(m_chunksBeingRead.begin(), m_chunksBeingRead.end(), chunk.seqNum) 
!= m_chunksBeingRead.end())
+  {
+MSPUB_DEBUG_MSG(("chunk %u is nested in itself", chunk.seqNum));
+return false;
+  }
+  const ChunkNestingGuard guard(m_chunksBeingRead, chunk.seqNum);
+
   unsigned page = pageSeqNum.get_value_or(chunk.parentSeqNum);
   input->seek(chunk.offset, librevenge::RVNG_SEEK_SET);
   if (topLevelCall)
diff --git a/src/lib/MSPUBParser2k.h b/src/lib/MSPUBParser2k.h
index f50e365..0d0ec57 100644
--- a/src/lib/MSPUBParser2k.h
+++ b/src/lib/MSPUBParser2k.h
@@ -10,6 +10,7 @@
 #ifndef __MSPUBPARSER2K_H__
 #define __MSPUBPARSER2K_H__
 
+#include 
 #include 
 #include 
 
@@ -25,6 +26,7 @@ class MSPUBParser2k : public MSPUBParser
   std::vector m_imageDataChunkIndices;
   std::vector m_quillColorEntries;
   std::map > m_chunkChildIndicesById;
+  std::deque m_chunksBeingRead;
 
 protected:
   // helper functions
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source include/LibreOfficeKit libreofficekit/qa

[Mihai Varga]

 desktop/source/lib/init.cxx   |   34 +
 include/LibreOfficeKit/LibreOfficeKit.h   |3 ++
 include/LibreOfficeKit/LibreOfficeKit.hxx |8 ++
 libreofficekit/qa/unit/tiledrendering.cxx |   35 ++
 4 files changed, 80 insertions(+)

New commits:
commit c5a516bd1bf0216ee39f31322369f6bffdf464eb
Author: Mihai Varga 
Date:   Mon Aug 17 18:49:40 2015 +0300

lok::Document getStyles method

This method returns a JSON mapping of style families to a list of styles
from the corresponding family.
Will be used to know and apply styles in tiledrendering.

Change-Id: I0aa395c40b9573920ade44255f97c077475ae5f1

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index abd8ca0..51302d1 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -35,11 +35,13 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -233,6 +235,7 @@ static void doc_setGraphicSelection 
(LibreOfficeKitDocument* pThis,
   int nX,
   int nY);
 static void doc_resetSelection (LibreOfficeKitDocument* pThis);
+static char* doc_getStyles(LibreOfficeKitDocument* pThis);
 
 struct LibLODocument_Impl : public _LibreOfficeKitDocument
 {
@@ -267,6 +270,7 @@ struct LibLODocument_Impl : public _LibreOfficeKitDocument
 m_pDocumentClass->getTextSelection = doc_getTextSelection;
 m_pDocumentClass->setGraphicSelection = doc_setGraphicSelection;
 m_pDocumentClass->resetSelection = doc_resetSelection;
+m_pDocumentClass->getStyles = doc_getStyles;
 
 gDocumentClass = m_pDocumentClass;
 }
@@ -864,6 +868,36 @@ static void doc_resetSelection(LibreOfficeKitDocument* 
pThis)
 pDoc->resetSelection();
 }
 
+static char* doc_getStyles(LibreOfficeKitDocument* pThis)
+{
+LibLODocument_Impl* pDocument = static_cast(pThis);
+
+boost::property_tree::ptree aTree;
+uno::Reference 
xStyleFamiliesSupplier(pDocument->mxComponent, uno::UNO_QUERY);
+uno::Reference 
xStyleFamilies(xStyleFamiliesSupplier->getStyleFamilies(), uno::UNO_QUERY);
+uno::Sequence aStyleFamilies = xStyleFamilies->getElementNames();
+
+for (sal_Int32 nStyleFam = 0; nStyleFam < aStyleFamilies.getLength(); 
++nStyleFam)
+{
+boost::property_tree::ptree aChildren;
+OUString sStyleFam = aStyleFamilies[nStyleFam];
+uno::Reference 
xStyleFamily(xStyleFamilies->getByName(sStyleFam), uno::UNO_QUERY);
+uno::Sequence aStyles = xStyleFamily->getElementNames();
+for (sal_Int32 nInd = 0; nInd < aStyles.getLength(); ++nInd)
+{
+boost::property_tree::ptree aChild;
+aChild.put("", aStyles[nInd]);
+aChildren.push_back(std::make_pair("", aChild));
+}
+aTree.add_child(sStyleFam.toUtf8().getStr(), aChildren);
+}
+std::stringstream aStream;
+boost::property_tree::write_json(aStream, aTree);
+char* pJson = static_cast(malloc(aStream.str().size() + 1));
+strcpy(pJson, aStream.str().c_str());
+pJson[aStream.str().size()] = '\0';
+return pJson;
+}
 static char* lo_getError (LibreOfficeKit *pThis)
 {
 LibLibreOffice_Impl* pLib = static_cast(pThis);
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h 
b/include/LibreOfficeKit/LibreOfficeKit.h
index e3b4850..af7155c 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -159,6 +159,9 @@ struct _LibreOfficeKitDocumentClass
 
 /// @see lok::Document::resetSelection
 void (*resetSelection) (LibreOfficeKitDocument* pThis);
+
+/// @see lok::Document:getStyles
+char* (*getStyles) (LibreOfficeKitDocument* pThis);
 #endif // LOK_USE_UNSTABLE_API
 };
 
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 816ade5..c526bda 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -246,6 +246,14 @@ public:
 {
 mpDoc->pClass->resetSelection(mpDoc);
 }
+
+/**
+ * Returns a json map, {"familyName1" : ["list of style names in the 
family1"], etc.}
+ */
+inline char* getStyles()
+{
+return mpDoc->pClass->getStyles(mpDoc);
+}
 #endif // LOK_USE_UNSTABLE_API
 };
 
diff --git a/libreofficekit/qa/unit/tiledrendering.cxx 
b/libreofficekit/qa/unit/tiledrendering.cxx
index 0ebbc6a..a4e5525 100644
--- a/libreofficekit/qa/unit/tiledrendering.cxx
+++ b/libreofficekit/qa/unit/tiledrendering.cxx
@@ -9,6 +9,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -67,6 +68,7 @@ public:
 void testDocumentTypes( Office* pOffice );
 void testImpressSlideNames( Office* pOffice );
 void testCalcSheetNames( Office* pOffice );
+void testGetStyles( Office* pOffice );
 #if 0
 voi

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-1' - sw/source

[Caolán McNamara]

 sw/source/filter/ww8/ww8scan.cxx |   18 +-
 sw/source/filter/ww8/ww8scan.hxx |4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 570ad4544297bc110245032eae972f0628abba26
Author: Caolán McNamara 
Date:   Thu Aug 13 10:58:06 2015 +0100

convert pStatus to vector and use at to check offsets

Change-Id: I5186f6a65bb9d5ed8a0d1ab1d71f7e2c13865411
(cherry picked from commit ea70088895ed45dc60abf18319acc1b4fa3018dd)
Reviewed-on: https://gerrit.libreoffice.org/17694
Reviewed-by: Eike Rathke 
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 
Reviewed-by: David Tardon 

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index c97db22..5895568 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -3988,7 +3988,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 
nStart, sal_Int32 nLen
 }
 
 WW8PLCFx_Book::WW8PLCFx_Book(SvStream* pTableSt, const WW8Fib& rFib)
-: WW8PLCFx(rFib.GetFIBVersion(), false), pStatus(0), nIsEnd(0), 
nBookmarkId(1)
+: WW8PLCFx(rFib.GetFIBVersion(), false), nIsEnd(0), nBookmarkId(1)
 {
 if( !rFib.fcPlcfbkf || !rFib.lcbPlcfbkf || !rFib.fcPlcfbkl ||
 !rFib.lcbPlcfbkl || !rFib.fcSttbfbkmk || !rFib.lcbSttbfbkmk )
@@ -4013,14 +4013,12 @@ WW8PLCFx_Book::WW8PLCFx_Book(SvStream* pTableSt, const 
WW8Fib& rFib)
 nIMax = pBook[0]->GetIMax();
 if( pBook[1]->GetIMax() < nIMax )
 nIMax = pBook[1]->GetIMax();
-pStatus = new eBookStatus[ nIMax ];
-memset( pStatus, 0, nIMax * sizeof( eBookStatus ) );
+aStatus.resize(nIMax);
 }
 }
 
 WW8PLCFx_Book::~WW8PLCFx_Book()
 {
-delete[] pStatus;
 delete pBook[1];
 delete pBook[0];
 }
@@ -4138,18 +4136,20 @@ long WW8PLCFx_Book::GetLen() const
 return nNum;
 }
 
-void WW8PLCFx_Book::SetStatus(sal_uInt16 nIndex, eBookStatus eStat )
+void WW8PLCFx_Book::SetStatus(sal_uInt16 nIndex, eBookStatus eStat)
 {
-OSL_ENSURE(nIndex < nIMax, "set status of non existing bookmark!");
-pStatus[nIndex] = (eBookStatus)( pStatus[nIndex] | eStat );
+SAL_WARN_IF(nIndex >= nIMax, "sw.ww8",
+"bookmark index " << nIndex << " invalid");
+eBookStatus eStatus = aStatus.at(nIndex);
+aStatus[nIndex] = static_cast(eStatus | eStat);
 }
 
 eBookStatus WW8PLCFx_Book::GetStatus() const
 {
-if( !pStatus )
+if (aStatus.empty())
 return BOOK_NORMAL;
 long nEndIdx = GetHandle();
-return ( nEndIdx < nIMax ) ? pStatus[nEndIdx] : BOOK_NORMAL;
+return ( nEndIdx < nIMax ) ? aStatus[nEndIdx] : BOOK_NORMAL;
 }
 
 long WW8PLCFx_Book::GetHandle() const
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 678482f..57ccae3 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -724,8 +724,8 @@ class WW8PLCFx_Book : public WW8PLCFx
 {
 private:
 WW8PLCFspecial* pBook[2];   // Start and End Position
-::std::vector aBookNames;   // Name
-eBookStatus* pStatus;
+std::vector aBookNames;   // Name
+std::vector aStatus;
 long nIMax; // Number of Booknotes
 sal_uInt16 nIsEnd;
 sal_Int32 nBookmarkId; // counter incremented by GetUniqueBookmarkName.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSoC] Haskell UNO Language Binding - Weekly Report 12

[Jorge Mendes]

Hi,

The past week I improved the code generation so that all the required
code is generated and manual modifications are not needed to make the
examples work. Moreover, the issue with UNO interfaces was also fixed,
and I made conversion for more UNO types. 'Any' values are handled
better (conversion from/to binary UNO to/from Haskell), but this work
is not complete yet. Also, I updated the examples so that all code
compiles and runs.

Another thing that I tried to do was to extract the configuration code
from the examples to 'hs-uno'. However, the examples would require the
latest Cabal version, which isn't yet on Hackage.

For this week, I'll write a bit of documentation (about the
infrastructure of this project, and how to use it), I'll add more
examples, and I'll keep improving the conversion of data between UNO
and Haskell.

Kind regards,
Jorge
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - include/oox oox/source

[Sushil Shinde]

 include/oox/export/shapes.hxx |1 +
 oox/source/export/shapes.cxx  |   15 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit c32709bac2b729572a96242cb8aa9026598dc269
Author: Sushil Shinde 
Date:   Tue Mar 3 19:14:25 2015 +0530

tdf#89806 : Fixed background fill export for table cell.

  1. Table cell properties were exproted empty if file
 saved as .pptx file.
  2. Now added code to export table cell fill properties
 in 'tcPr'(Table cell properties xml tag)

Reviewed-on: https://gerrit.libreoffice.org/14734
Tested-by: Jenkins 
Reviewed-by: David Tardon 
Tested-by: David Tardon 
(cherry picked from commit 63442ec636d637e05d7d585817df531dbbeb96d9)

Conflicts:
sd/qa/unit/export-tests.cxx

Change-Id: Ica6005a65c7eefb8629c808f2a54764f98badb11

diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx
index bfc0cab..c94be84 100644
--- a/include/oox/export/shapes.hxx
+++ b/include/oox/export/shapes.hxx
@@ -158,6 +158,7 @@ public:
 
 void WriteTable( ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape > rXShape );
 
+void WriteTableCellProperties(::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet > rXPropSet);
 
 sal_Int32 GetNewShapeID( const ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape > rShape );
 sal_Int32 GetNewShapeID( const ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape > rShape, ::oox::core::XmlFilterBase* pFB );
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index a324d27..9d54b44 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -985,7 +985,9 @@ void ShapeExport::WriteTable( Reference< XShape > rXShape  )
 
 WriteTextBox( xCell, XML_a );
 
-mpFS->singleElementNS( XML_a, XML_tcPr, FSEND );
+Reference< XPropertySet > xCellPropSet(xCell, 
UNO_QUERY_THROW);
+WriteTableCellProperties(xCellPropSet);
+
 mpFS->endElementNS( XML_a, XML_tc );
 }
 }
@@ -1000,6 +1002,17 @@ void ShapeExport::WriteTable( Reference< XShape > 
rXShape  )
 mpFS->endElementNS( XML_a, XML_graphic );
 }
 
+void ShapeExport::WriteTableCellProperties(Reference< XPropertySet> 
xCellPropSet)
+{
+mpFS->startElementNS( XML_a, XML_tcPr, FSEND );
+// Write background fill for table cell.
+DrawingML::WriteFill(xCellPropSet);
+// TODO
+// tcW : Table cell width
+// tcBorders : Table cell border values.
+mpFS->endElementNS( XML_a, XML_tcPr );
+}
+
 ShapeExport& ShapeExport::WriteTableShape( Reference< XShape > xShape )
 {
 FSHelperPtr pFS = GetFS();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libmspub.git: src/lib

[David Tardon]

 src/lib/MSPUBParser2k.cpp |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 1023378fcd0974c38d23fce906d8552406dbe599
Author: David Tardon 
Date:   Tue Aug 18 11:51:53 2015 +0200

fix brain fart

Change-Id: Ifa0015945255b2a6e2c9da25b89b0b4648465290

diff --git a/src/lib/MSPUBParser2k.cpp b/src/lib/MSPUBParser2k.cpp
index 7003b72..3f2aaf3 100644
--- a/src/lib/MSPUBParser2k.cpp
+++ b/src/lib/MSPUBParser2k.cpp
@@ -564,11 +564,13 @@ bool 
MSPUBParser2k::parseGroup(librevenge::RVNGInputStream *input, unsigned seqN
   bool retVal = true;
   m_collector->beginGroup();
   m_collector->setCurrentGroupSeqNum(seqNum);
-  if (seqNum < m_chunkChildIndicesById.size())
+  const std::map >::const_iterator it = 
m_chunkChildIndicesById.find(seqNum);
+  if (it != m_chunkChildIndicesById.end())
   {
-for (unsigned i = 0; i < m_chunkChildIndicesById[seqNum].size(); ++i)
+const std::vector &chunkChildIndices = it->second;
+for (unsigned i = 0; i < chunkChildIndices.size(); ++i)
 {
-  const ContentChunkReference &childChunk = 
m_contentChunks.at(m_chunkChildIndicesById[seqNum][i]);
+  const ContentChunkReference &childChunk = 
m_contentChunks.at(chunkChildIndices[i]);
   if (childChunk.type == SHAPE || childChunk.type == GROUP)
   {
 retVal = retVal && parse2kShapeChunk(childChunk, input, page, false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basic/source sc/qa

[Laurent Godard]

 basic/source/classes/image.cxx  |  161 
 sc/qa/extras/macros-test.cxx|   33 
 sc/qa/extras/testdocuments/testTypePassword.ods |binary
 3 files changed, 194 insertions(+)

New commits:
commit 0405975042e91e5cca56068ad0d16ad8ab910737
Author: Laurent Godard 
Date:   Mon Aug 17 13:28:16 2015 +0200

tdf#75973 : User Defined Types in password encrypted macros

save/load basic script so that when executing password protected
the user defined types can be rebuilt

supports array and nested types

a unit test in sc macros-test.cxx

Change-Id: Ie127ea7ad9aea3353741048c00f1b3910c5517a4
Reviewed-on: https://gerrit.libreoffice.org/17815
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 0fa3d13..fa4feac 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -240,6 +240,90 @@ bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
 }
 break;
 }
+case B_SBXOBJECTS:
+
+// User defined types
+for (sal_uInt16 i = 0; i < nCount; i++)
+{
+OUString aTypeName = r.ReadUniOrByteString(eCharSet);
+
+sal_Int16 nTypeMembers;
+r.ReadInt16(nTypeMembers);
+
+SbxObject *pType = new SbxObject(aTypeName);
+SbxArray *pTypeMembers = pType->GetProperties();
+
+for (sal_uInt16 j = 0; j < nTypeMembers; j++)
+{
+OUString aMemberName = r.ReadUniOrByteString(eCharSet);
+
+sal_Int16 aIntMemberType;
+r.ReadInt16(aIntMemberType);
+SbxDataType aMemberType = static_cast< SbxDataType > ( 
aIntMemberType );
+
+SbxProperty *pTypeElem = new SbxProperty( aMemberName, 
aMemberType );
+
+sal_uInt32 aIntFlag;
+r.ReadUInt32(aIntFlag);
+SbxFlagBits nElemFlags = static_cast< SbxFlagBits > ( 
aIntFlag );
+
+pTypeElem->SetFlags(nElemFlags);
+
+sal_Int16 hasObject;
+r.ReadInt16(hasObject);
+
+if (hasObject == 1)
+{
+if(aMemberType == SbxOBJECT)
+{
+// nested user defined types
+// declared before use, so it is ok to 
reference it by name on load
+// nested types not structuraly compatible 
with arrays at the moment
+OUString aNestedTypeName = 
r.ReadUniOrByteString(eCharSet);
+SbxObject* pNestedTypeObj = static_cast< 
SbxObject* >( rTypes->Find( aNestedTypeName, SbxCLASS_OBJECT ) );
+if (pNestedTypeObj)
+{
+SbxObject* pCloneObj = 
cloneTypeObjectImpl( *pNestedTypeObj );
+pTypeElem->PutObject( pCloneObj );
+}
+}
+else
+{
+// an array
+// not compatible with nested user defined 
types at the moment
+SbxDimArray* pArray = new SbxDimArray();
+
+sal_Int16 isFixedSize;
+r.ReadInt16(isFixedSize);
+if (isFixedSize == 1)
+pArray->setHasFixedSize( true );
+
+sal_Int32 nDims;
+r.ReadInt32(nDims);
+for (sal_Int32 d = 0; d < nDims; d++)
+{
+sal_Int32 lBound;
+sal_Int32 uBound;
+r.ReadInt32(lBound).ReadInt32(uBound);
+pArray->unoAddDim32(lBound, uBound);
+}
+
+pTypeElem->PutObject( pArray );
+}
+}
+
+pTypeMembers->Insert( pTypeElem, pTypeMembers->Count() 
);
+
+}
+
+pType->Remove( OUString("Name"), SbxCLASS_DONTCARE );
+pType->Remove( OUString("Parent"), SbxCLASS_DONTCARE );
+
+AddType(pType);
+}
+
+break;
+
 case B_MODEND:
 goto done;
 default:
@@ -360,6 +444,83

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - vcl/source

[Tomaž Vajngerl]

 vcl/source/opengl/OpenGLHelper.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit dfac25d2300b56ee4594346a4b5ce8b083a5c782
Author: Tomaž Vajngerl 
Date:   Fri Jul 3 14:38:24 2015 +0900

tdf#88831 fix inverted textures when OpenGL is enabled

GLX returns a wrong value if the y coords are inverted. Most other
programs don't even ask for this (gnome-shell for example) and just
assumes "true" (and this works because most relevant X servers work
like this). We make this more robust and assume true only if the
returned value is GLX_DONT_CARE (-1).

(cherry picked from commit f7f0486376adbabf3ea66bfd8a7b692c335ec3c8)

Change-Id: I4800b3364fd00f5f4a8f5a459472bfa8d97827ba
Reviewed-on: https://gerrit.libreoffice.org/17707
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/vcl/source/opengl/OpenGLHelper.cxx 
b/vcl/source/opengl/OpenGLHelper.cxx
index c71380e..6387192 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -507,7 +507,11 @@ GLXFBConfig OpenGLHelper::GetPixmapFBConfig( Display* 
pDisplay, bool& bInverted
 }
 
 glXGetFBConfigAttrib( pDisplay, aFbConfigs[i], GLX_Y_INVERTED_EXT, 
&nValue );
-bInverted = (nValue == True) ? true : false;
+
+// Looks like that X sends GLX_DONT_CARE but this usually means "true" 
for most
+// of the X implementations. Investigation on internet pointed that 
this could be
+// safely "true" all the time (for example gnome-shell always assumes 
"true").
+bInverted = nValue == True || nValue == int(GLX_DONT_CARE);
 
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - desktop/source

[Michael Meeks]

 desktop/source/lib/init.cxx |   28 +---
 1 file changed, 5 insertions(+), 23 deletions(-)

New commits:
commit 4a3484af6d6b259d4a5b0fa93c7d83ece6f175b7
Author: Michael Meeks 
Date:   Tue Aug 18 10:58:01 2015 +0100

Cleanup symbol export conditionals.

Change-Id: Ic25500637f1748bf117bafd7483d589729a2e658

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index a33922f..88a2f06 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1063,19 +1063,9 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath, const char
 return bInitialized;
 }
 
-// Undo our clever trick of having SAL_DLLPUBLIC_EXPORT actually not
-// meaning what is says in for the DISABLE_DYNLOADING case. See
-// . Normally, when building just one big dylib (Android)
-// or executable (iOS), most of our "public" symbols don't need to be
-// visible outside that resulting dylib/executable. But
-// libreofficekit_hook must be exported for dlsym() to find it,
-// though, at least on iOS.
-
-#if defined(__GNUC__) && defined(HAVE_GCC_VISIBILITY_FEATURE) && 
defined(DISABLE_DYNLOADING)
-__attribute__ ((visibility("default")))
-#else
-SAL_DLLPUBLIC_EXPORT
-#endif
+// SAL_JNI_EXPORT to handle DISABLE_DYNLOADING case.
+
+SAL_JNI_EXPORT
 LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char* 
user_profile_path)
 {
 if (!gImpl)
@@ -1091,21 +1081,13 @@ LibreOfficeKit *libreofficekit_hook_2(const char* 
install_path, const char* user
 return static_cast(gImpl);
 }
 
-#if defined(__GNUC__) && defined(HAVE_GCC_VISIBILITY_FEATURE) && 
defined(DISABLE_DYNLOADING)
-__attribute__ ((visibility("default")))
-#else
-SAL_DLLPUBLIC_EXPORT
-#endif
+SAL_JNI_EXPORT
 LibreOfficeKit *libreofficekit_hook(const char* install_path)
 {
 return libreofficekit_hook_2(install_path, NULL);
 }
 
-#if defined(__GNUC__) && defined(HAVE_GCC_VISIBILITY_FEATURE) && 
defined(DISABLE_DYNLOADING)
-__attribute__ ((visibility("default")))
-#else
-SAL_DLLPUBLIC_EXPORT
-#endif
+SAL_JNI_EXPORT
 int lok_preinit()
 {
 SAL_INFO("lok", "Hello World");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sc/source

[Eike Rathke]

 sc/source/core/data/document.cxx|8 ++
 sc/source/core/data/formulacell.cxx |  133 
 2 files changed, 141 insertions(+)

New commits:
commit f7e493229bd949066b4d8984dce7678b8687d1ae
Author: Eike Rathke 
Date:   Tue Aug 18 11:33:44 2015 +0200

Resolves: tdf#92749 invalidate lookup caches after initial hard recalc

... because the caches are not setup as listeners during when the
document's hard recalc state is active.

Change-Id: Ie7ec84ee64d046e3e55ce26b92824e94a2f660e9

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 7943fa5..b0b3aa3 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3780,6 +3780,14 @@ void ScDocument::CalcAll()
 if (*it)
 (*it)->CalcAll();
 ClearFormulaTree();
+
+// In hard recalc state caches were not added as listeners, invalidate them
+// so the next non-CalcAll() normal lookup will not be presented with
+// outdated data.
+/* TODO: come up with more detailed hard recalc states so we can
+ * differentiate between hard recalc after load and others. */
+if (GetHardRecalcState())
+ClearLookupCaches();
 }
 
 void ScDocument::CompileAll()
commit a962d699b044ee1688e914873c72337fa6217619
Author: Eike Rathke 
Date:   Tue Aug 18 11:32:05 2015 +0200

add a simple formula cell calculation chain dumper

Change-Id: Ie6409724dcf0baa2f1d7dd62ed8d995f0374dbf1

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index c90ab3e..bfda996 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -70,6 +70,121 @@ using namespace formula;
 IMPL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell )
 #endif
 
+#define DEBUG_CALCULATION 0
+#if DEBUG_CALCULATION
+static ScAddress aDebugCalculationTriggerAddress(1,2,0);// Sheet1.B3, 
whatever you like
+
+struct DebugCalculationEntry
+{
+  ScAddress maPos;
+  OUString  maResult;
+const ScDocument*   mpDoc;
+
+DebugCalculationEntry( const ScAddress& rPos, const ScDocument* pDoc ) :
+maPos(rPos),
+mpDoc(pDoc)
+{
+}
+};
+
+/** Debug/dump formula cell calculation chain.
+Either, somewhere set aDC.mbActive=true, or
+aDC.maTrigger=ScAddress(col,row,tab) of interest from where to start.
+This does not work for deep recursion > MAXRECURSION, the results are
+somewhat.. funny.. ;)
+ */
+static struct DebugCalculation
+{
+std::vector< DebugCalculationEntry >mvPos;
+std::vector< DebugCalculationEntry >mvResults;
+ScAddress   maTrigger;
+boolmbActive;
+boolmbSwitchOff;
+boolmbPrint;
+boolmbPrintResults;
+
+DebugCalculation() : mbActive(false), mbSwitchOff(false), mbPrint(true), 
mbPrintResults(false) {}
+
+/** Print chain in encountered dependency order. */
+void print() const
+{
+for (auto const& it : mvPos)
+{
+OUString aStr( it.maPos.Format( SCA_VALID | SCA_TAB_3D, it.mpDoc));
+fprintf( stderr, "%s -> ", aStr.toUtf8().getStr());
+}
+fprintf( stderr, "%s", "END\n");
+}
+
+/** Print chain results. */
+void printResults() const
+{
+for (auto const& it : mvResults)
+{
+OUString aStr( it.maPos.Format( SCA_VALID | SCA_TAB_3D, it.mpDoc));
+aStr += "(" + it.maResult + ")";
+fprintf( stderr, "%s, ", aStr.toUtf8().getStr());
+}
+fprintf( stderr, "%s", "END\n");
+}
+
+void storeResult( const svl::SharedString& rStr )
+{
+if (mbActive && !mvPos.empty())
+mvPos.back().maResult = rStr.getString();
+}
+
+void storeResult( const double& fVal )
+{
+if (mbActive && !mvPos.empty())
+storeResult( rtl::math::doubleToUString( fVal, 
rtl_math_StringFormat_G, 2, '.', true));
+}
+
+} aDC;
+
+struct DebugCalculationStacker
+{
+DebugCalculationStacker( const ScAddress& rPos, const ScDocument* pDoc )
+{
+if (!aDC.mbActive && rPos == aDC.maTrigger)
+aDC.mbActive = aDC.mbSwitchOff = true;
+if (aDC.mbActive)
+{
+aDC.mvPos.push_back( DebugCalculationEntry( rPos, pDoc));
+aDC.mbPrint = true;
+}
+}
+
+~DebugCalculationStacker()
+{
+if (aDC.mbActive)
+{
+if (!aDC.mvPos.empty())
+{
+if (aDC.mbPrint)
+{
+aDC.print();
+aDC.mbPrint = false;
+}
+if (aDC.mbPrintResults)
+{
+// Store results until final result is available, 
reversing order.
+aDC.mvResults.push_back( aD

Re: [PATCH] resolved: crash while closing ImageMap Editor

[Michael Meeks]

Hi Szymon,

On Sun, 2015-08-16 at 10:19 +, Szymon Kłos (via Code Review) wrote:
> Change subject: resolved: crash while closing ImageMap Editor

Thanks so much for that =)

I've pushed to 5-0 and gerrit for -5-0-1 - extra reviews appreciated:

https://gerrit.libreoffice.org/17827

Wrt. a more general concern about Links - it is interesting; the ~Link
destructor does not remove the link (and doesn't have the information to
do so).

So my hope is that this is a minor sequencing issue and not a
widespread thing we need to tackle now.

Having said that - having a variant of Link that keeps track of its
target object and removes the link on dispose automatically sounds like
rather a good idea to me (GObject has something like this).

Thanks !

Michael.

-- 
 michael.me...@collabora.com  <><, Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: basctl/source

[Laurent Godard]

 basctl/source/basicide/baside2b.cxx |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit ddb43837ca74295b848d3217064a2442b0a12b8c
Author: Laurent Godard 
Date:   Tue Aug 18 09:24:26 2015 +0200

avoid basic ide crash in code autocompletion

due to code completion and user defined types

type MyType
  a as string
  b as string
end type

dim aa as MyType

typing
aa.b.
the last point led to crash

remaining problem
code autocorrection now shows wrong behaviour as
aa.b.
autocorrects (wrongly) to
.

Change-Id: I3e05680cd9d82f7dc124c5923f9858e22961896e
Reviewed-on: https://gerrit.libreoffice.org/17824
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index d1a29ae..d4961d5 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -860,8 +860,10 @@ void EditorWindow::HandleCodeCompletion()
 
 if( aVect.empty() )//nothing to do
 return;
+
 OUString sBaseName = aVect[0];//variable name
 OUString sVarType = aCodeCompleteCache.GetVarType( sBaseName );
+
 if( !sVarType.isEmpty() && CodeCompleteOptions::IsAutoCorrectOn() )
 {//correct variable name, if autocorrection on
 const OUString& sStr = aCodeCompleteCache.GetCorrectCaseVarName( 
sBaseName, GetActualSubName(nLine) );
@@ -3002,6 +3004,10 @@ std::vector< OUString > 
UnoTypeCodeCompletetor::GetXIdlClassFields() const
 
 bool UnoTypeCodeCompletetor::CheckField( const OUString& sFieldName )
 {// modifies xClass!!!
+
+if ( xClass == NULL )
+return false;
+
 Reference< reflection::XIdlField> xField = xClass->getField( sFieldName );
 if( xField != NULL )
 {
@@ -3016,6 +3022,11 @@ bool UnoTypeCodeCompletetor::CheckField( const OUString& 
sFieldName )
 
 bool UnoTypeCodeCompletetor::CheckMethod( const OUString& sMethName )
 {// modifies xClass!!!
+
+
+if ( xClass == NULL )
+return false;
+
 Reference< reflection::XIdlMethod> xMethod = xClass->getMethod( sMethName 
);
 if( xMethod != NULL ) //method OK, check return type
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-1' - svx/source

[Szymon Kłos]

 svx/source/dialog/_contdlg.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 0464718dfe7401bc7e19e76226b9a1fe74c68a9e
Author: Szymon Kłos 
Date:   Fri Aug 14 12:42:58 2015 +0200

tdf#93102 : resolved crash on enabling image contour

Change-Id: I59a07a62573b8d472d15f8594473e8e8d1077589
Reviewed-on: https://gerrit.libreoffice.org/17758
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
Signed-off-by: Michael Meeks 
Reviewed-on: https://gerrit.libreoffice.org/17827

diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 3426ea3..47e783a 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -299,6 +299,8 @@ SvxSuperContourDlg::~SvxSuperContourDlg()
 
 void SvxSuperContourDlg::dispose()
 {
+m_pContourWnd->SetUpdateLink( Link<>() );
+
 SvtMiscOptions aMiscOptions;
 aMiscOptions.RemoveListenerLink( LINK(this, SvxSuperContourDlg, MiscHdl) );
 m_pContourWnd.disposeAndClear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/qa vcl/source

[Miklos Vajna]

 sw/qa/core/data/ooxml/pass/tdf93284.docx |binary
 vcl/source/filter/wmf/winmtf.cxx |6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9dd9208d54d64eb53d95853af725712229d41fad
Author: Miklos Vajna 
Date:   Mon Aug 17 09:13:12 2015 +0200

tdf#93284 vcl: fix VirtualDevice leaks in the WMF filter

We attempted to have 8884 VirtualDevices in parallel. This number is now
12 after fixing the leaks.

The original bugdoc has 135 images, 76 is enough to make Writer on
Windows crash. The minimized document has the same WMF data for all the
images, but still duplicated inside the ZIP container, so we trigger the
resource limit, but the document is still just 99K.

Change-Id: I4c6b3853eaf688302323daf67ff7b62dd64fc412
(cherry picked from commit 047ebb1dadcc0219a268455f74fc03a23aa3d86d)
Reviewed-on: https://gerrit.libreoffice.org/17825
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/qa/core/data/ooxml/pass/tdf93284.docx 
b/sw/qa/core/data/ooxml/pass/tdf93284.docx
new file mode 100755
index 000..aedc026
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/tdf93284.docx differ
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 20e2b5c..c5d1cf9 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -236,7 +236,7 @@ WinMtfFontStyle::WinMtfFontStyle( LOGFONTW& rFont )
 {
 // #i117968# VirtualDevice is not thread safe, but filter is used in 
multithreading
 SolarMutexGuard aGuard;
-VclPtrInstance< VirtualDevice > pVDev;
+ScopedVclPtrInstance< VirtualDevice > pVDev;
 // converting the cell height into a font height
 aFont.SetSize( aFontSize );
 pVDev->SetFont( aFont );
@@ -1451,7 +1451,7 @@ void WinMtfOutput::DrawText( Point& rPosition, OUString& 
rText, long* pDXArry, b
 {
 // #i117968# VirtualDevice is not thread safe, but filter is used in 
multithreading
 SolarMutexGuard aGuard;
-VclPtrInstance< VirtualDevice > pVDev;
+ScopedVclPtrInstance< VirtualDevice > pVDev;
 sal_Int32 nTextWidth;
 pVDev->SetMapMode( MapMode( MAP_100TH_MM ) );
 pVDev->SetFont( maFont );
@@ -1499,7 +1499,7 @@ void WinMtfOutput::DrawText( Point& rPosition, OUString& 
rText, long* pDXArry, b
 {
 // #i117968# VirtualDevice is not thread safe, but filter is used 
in multithreading
 SolarMutexGuard aGuard;
-VclPtrInstance< VirtualDevice > pVDev;
+ScopedVclPtrInstance< VirtualDevice > pVDev;
 pDX = new long[ rText.getLength() ];
 pVDev->SetMapMode( MAP_100TH_MM );
 pVDev->SetFont( maLatestFont );
___
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

[Miklos Vajna]

 sw/source/core/txtnode/thints.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3c6cdfe08420eefaa97d957c3908daf76b14e684
Author: Miklos Vajna 
Date:   Wed Jul 29 09:08:00 2015 +0200

tdf#89954 sw: let annotation have CH_TXTATR_INWORD placeholder again

Regression from commit 0761f81643a6890457e9ef7d913ab5c88c2593a4 (123792:
complete annotations on text ranges feature, 2013-12-19), the problem
was that while sw wanted CH_TXTATR_INWORD as a placeholder character for
anchor positions that do not count as a word boundary, the commit
changed GetCharOfTextAttr() so that annotations have CH_TXTATR_BREAKWORD
as the placeholder.

Fix the problem by reverting the last hunk of
sw/source/core/txtnode/thints.cxx changes in that commit.

(cherry picked from commit 89d615360e80a13fff6bc69885e5780d8fedf149,
testcase not backported as libreoffice-4-4 does not have LOK editing API
yet)

Conflicts:
sw/qa/extras/uiwriter/uiwriter.cxx

Change-Id: Ia8c97efda9c1e90ae3c27ddb8247e3f3203a63fb
Reviewed-on: https://gerrit.libreoffice.org/17826
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/core/txtnode/thints.cxx 
b/sw/source/core/txtnode/thints.cxx
index a03b391a7..d05efb0 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -3443,6 +3443,7 @@ sal_Unicode GetCharOfTxtAttr( const SwTxtAttr& rAttr )
 {
 case RES_TXTATR_REFMARK:
 case RES_TXTATR_TOXMARK:
+case RES_TXTATR_ANNOTATION:
 cRet = CH_TXTATR_INWORD;
 break;
 
@@ -3451,7 +3452,6 @@ sal_Unicode GetCharOfTxtAttr( const SwTxtAttr& rAttr )
 case RES_TXTATR_FTN:
 case RES_TXTATR_META:
 case RES_TXTATR_METAFIELD:
-case RES_TXTATR_ANNOTATION:
 {
 cRet = CH_TXTATR_BREAKWORD;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - svx/source

[Szymon Kłos]

 svx/source/dialog/_contdlg.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit b6bd0111073d0a94b40b20cce85e10cdcb791d3e
Author: Szymon Kłos 
Date:   Fri Aug 14 12:42:58 2015 +0200

tdf#93102 : resolved crash on enabling image contour

Change-Id: I59a07a62573b8d472d15f8594473e8e8d1077589
Reviewed-on: https://gerrit.libreoffice.org/17758
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
Signed-off-by: Michael Meeks 

diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 3426ea3..47e783a 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -299,6 +299,8 @@ SvxSuperContourDlg::~SvxSuperContourDlg()
 
 void SvxSuperContourDlg::dispose()
 {
+m_pContourWnd->SetUpdateLink( Link<>() );
+
 SvtMiscOptions aMiscOptions;
 aMiscOptions.RemoveListenerLink( LINK(this, SvxSuperContourDlg, MiscHdl) );
 m_pContourWnd.disposeAndClear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - fpicker/source fpicker/uiconfig include/svtools svtools/source

[Szymon Kłos]

 fpicker/source/office/RemoteFilesDialog.cxx |   31 +---
 fpicker/source/office/RemoteFilesDialog.hxx |3 +-
 fpicker/uiconfig/ui/remotefilesdialog.ui|   17 +--
 include/svtools/fileview.hxx|3 +-
 svtools/source/contnr/fileview.cxx  |   11 +++--
 5 files changed, 46 insertions(+), 19 deletions(-)

New commits:
commit 910bdba989e09120faacafa050dfe187c68e4e2e
Author: Szymon Kłos 
Date:   Tue Aug 18 10:42:41 2015 +0200

RemoteFilesDialog: file name autocompletion

Change-Id: Iab051ccaf075cc91acce67e01863e8d7ecac820c

diff --git a/fpicker/source/office/RemoteFilesDialog.cxx 
b/fpicker/source/office/RemoteFilesDialog.cxx
index 402cd75..e8d25c6 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -183,7 +183,6 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, 
WinBits nBits )
 get( m_pAddService_btn, "add_service_btn" );
 get( m_pServices_lb, "services_lb" );
 get( m_pFilter_lb, "filter_lb" );
-get( m_pName_ed, "name_ed" );
 get( m_pNewFolder, "new_folder" );
 
 m_eMode = ( nBits & WB_SAVEAS ) ? REMOTEDLG_MODE_SAVE : 
REMOTEDLG_MODE_OPEN;
@@ -194,6 +193,9 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, 
WinBits nBits )
 m_bServiceChanged = false;
 m_nCurrentFilter = LISTBOX_ENTRY_NOTFOUND;
 
+m_pName_ed = VclPtr< AutocompleteEdit >::Create( get< vcl::Window >( 
"filename_container" ) );
+m_pName_ed->Show();
+
 m_pFilter_lb->Enable( false );
 m_pName_ed->Enable( false );
 
@@ -1263,8 +1265,31 @@ void RemoteFilesDialog::UpdateControls( const OUString& 
rURL )
 m_pTreeView->SetSelectHdl( Link<>() );
 
 // read cached data for this url and fill the tree
-const ::std::vector< std::pair< OUString, OUString > >& rFolders = 
m_pFileView->GetSubFolders();
-m_pTreeView->FillTreeEntry( rURL, rFolders );
+const ::std::vector< SvtContentEntry >& rFolders = 
m_pFileView->GetContent();
+::std::vector< std::pair< OUString, OUString > > aFolders;
+
+m_pName_ed->ClearEntries();
+
+for( ::std::vector< SvtContentEntry >::size_type i = 0; i < 
rFolders.size(); i++ )
+{
+int nTitleStart = rFolders[i].maURL.lastIndexOf( '/' );
+if( nTitleStart != -1 )
+{
+OUString sTitle( INetURLObject::decode(
+rFolders[i].maURL.copy( nTitleStart + 1 ),
+INetURLObject::DECODE_WITH_CHARSET ) );
+
+if( rFolders[i].mbIsFolder )
+{
+aFolders.push_back( std::pair< OUString, OUString > ( sTitle, 
rFolders[i].maURL ) );
+}
+
+// add entries to the autocompletion mechanism
+m_pName_ed->AddEntry( sTitle );
+}
+}
+
+m_pTreeView->FillTreeEntry( rURL, aFolders );
 
 m_pTreeView->SetSelectHdl( LINK( this, RemoteFilesDialog, TreeSelectHdl ) 
);
 
diff --git a/fpicker/source/office/RemoteFilesDialog.hxx 
b/fpicker/source/office/RemoteFilesDialog.hxx
index 4fe1188..bb0abaa 100644
--- a/fpicker/source/office/RemoteFilesDialog.hxx
+++ b/fpicker/source/office/RemoteFilesDialog.hxx
@@ -12,6 +12,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -156,7 +157,7 @@ private:
 VclPtr< SvtFileView > m_pFileView;
 VclPtr< FileViewContainer > m_pContainer;
 VclPtr< ListBox > m_pFilter_lb;
-VclPtr< Edit > m_pName_ed;
+VclPtr< AutocompleteEdit > m_pName_ed;
 PopupMenu* m_pAddMenu;
 
 ImageList m_aImages;
diff --git a/fpicker/uiconfig/ui/remotefilesdialog.ui 
b/fpicker/uiconfig/ui/remotefilesdialog.ui
index e0699a5..7859348 100644
--- a/fpicker/uiconfig/ui/remotefilesdialog.ui
+++ b/fpicker/uiconfig/ui/remotefilesdialog.ui
@@ -234,26 +234,29 @@
   
 
 
-  
+  
+200
 True
-True
+False
 True
   
   
 1
-1
+0
   
 
 
-  
-200
+  
 True
 False
-True
+vertical
+
+  
+
   
   
 1
-0
+1
   
 
   
diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx
index cfcc42a..5789d2b 100644
--- a/include/svtools/fileview.hxx
+++ b/include/svtools/fileview.hxx
@@ -36,6 +36,7 @@ class ViewTabListBox_Impl;
 class SvtFileView_Impl;
 class SvTreeListEntry;
 class HeaderBar;
+struct SvtContentEntry;
 
 /// the result of an action in the FileView
 enum FileViewResult
@@ -173,7 +174,7 @@ public:
 
 voidEndInplaceEditing( bool _bCancel );
 
-::std::vector< std::pair< OUString, OUSt

[Libreoffice-commits] core.git: sw/source

[Miklos Vajna]

 sw/source/core/view/viewsh.cxx |   20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 222f10e773ba51a19880be1b798990260c198147
Author: Miklos Vajna 
Date:   Tue Aug 18 09:59:46 2015 +0200

tdf#93096 sw: fix selection with keyboard outside current view

Regression from commit c9175a1bd3249ad573ae6827bf19963a3ebe2fbc
(SwViewShell::ImplEndAction: avoid direct PaintDesktop(), 2015-07-03),
the problem is that while going via InvalidateWindows() is fine for the
double-buffering case, it has side effects when painting directly, so
revert back to the old code in that case.

Change-Id: Ib1e3b143f5cfe2c6ab8b102a1a2064900282f136

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 80aa194..4f8edf7 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -405,7 +405,25 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd )
 }
 if ( bPaint )
 {
-InvalidateWindows(aRect.SVRect());
+if (GetWin() && GetWin()->SupportsDoubleBuffering())
+InvalidateWindows(aRect.SVRect());
+else
+{
+// #i75172# begin DrawingLayer paint
+// need to do begin/end DrawingLayer preparation 
for each single rectangle of the
+// repaint region. I already tried to prepare only 
once for the whole Region. This
+// seems to work (and does technically) but fails 
with transparent objects. Since the
+// region given to BeginDarwLayers() defines the 
clip region for DrawingLayer paint,
+// transparent objects in the single rectangles 
will indeed be painted multiple times.
+DLPrePaint2(vcl::Region(aRect.SVRect()));
+
+if ( bPaintsFromSystem )
+PaintDesktop(*GetOut(), aRect);
+
pCurrentLayout->GetCurrShell()->InvalidateWindows(aRect.SVRect());
+
+// #i75172# end DrawingLayer paint
+DLPostPaint2(true);
+}
 }
 else
 lcl_PaintTransparentFormControls(*this, aRect); // 
i#107365
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - include/svtools svtools/Library_svt.mk svtools/source

[Szymon Kłos]

 include/svtools/autocmpledit.hxx|   39 +++
 svtools/Library_svt.mk  |1 
 svtools/source/control/autocmpledit.cxx |  110 
 3 files changed, 150 insertions(+)

New commits:
commit 505e8f52469cb946b298b7d81bc02d0e1d8c2b5a
Author: Szymon Kłos 
Date:   Mon Aug 17 23:01:53 2015 +0200

Edit control with autocompletion

Change-Id: Id3aefbffa6b36b475ca78856c9e103cef433f88c

diff --git a/include/svtools/autocmpledit.hxx b/include/svtools/autocmpledit.hxx
new file mode 100644
index 000..49407d44
--- /dev/null
+++ b/include/svtools/autocmpledit.hxx
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_SVTOOLS_AUTOCMPLEDIT_HXX
+#define INCLUDED_SVTOOLS_AUTOCMPLEDIT_HXX
+
+#include 
+
+#include 
+
+#include 
+
+class SVT_DLLPUBLIC AutocompleteEdit : public Edit
+{
+private:
+std::vector< OUString > m_aEntries;
+std::vector< OUString > m_aMatching;
+std::vector< OUString >::size_type m_nCurrent;
+
+void AutoCompleteHandler( Edit* );
+bool Match( const OUString& rText );
+bool PreNotify( NotifyEvent& rNEvt );
+
+public:
+AutocompleteEdit( vcl::Window* pParent );
+
+void AddEntry( const OUString& rEntry );
+void ClearEntries();
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index f6c834d..b877d46 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -107,6 +107,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
 svtools/source/contnr/viewdataentry \
 svtools/source/control/accessibleruler \
 svtools/source/control/asynclink \
+svtools/source/control/autocmpledit \
 svtools/source/control/breadcrumb \
 svtools/source/control/calendar \
 svtools/source/control/collatorres \
diff --git a/svtools/source/control/autocmpledit.cxx 
b/svtools/source/control/autocmpledit.cxx
new file mode 100644
index 000..14cf58b
--- /dev/null
+++ b/svtools/source/control/autocmpledit.cxx
@@ -0,0 +1,110 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+
+AutocompleteEdit::AutocompleteEdit( vcl::Window* pParent )
+: Edit( pParent )
+, m_nCurrent( 0 )
+{
+SignalConnectAutocomplete( nullptr,
+[this] ( Edit *const pEdit ) { this->AutoCompleteHandler( pEdit ); 
} );
+}
+
+void AutocompleteEdit::AddEntry( const OUString& rEntry )
+{
+m_aEntries.push_back( rEntry );
+}
+
+void AutocompleteEdit::ClearEntries()
+{
+m_aEntries.clear();
+m_aMatching.clear();
+}
+
+void AutocompleteEdit::AutoCompleteHandler( Edit* )
+{
+if( GetAutocompleteAction() != AUTOCOMPLETE_KEYINPUT )
+return;
+
+if( Application::AnyInput( VclInputFlags::KEYBOARD ) )
+return;
+
+OUString aCurText = GetText();
+Selection aSelection( GetSelection() );
+
+if( aSelection.Max() != aCurText.getLength() )
+return;
+
+sal_uInt16 nLen = ( sal_uInt16 )aSelection.Min();
+aCurText = aCurText.copy( 0, nLen );
+if( !aCurText.isEmpty() )
+{
+if( m_aEntries.size() )
+{
+if( Match( aCurText ) )
+{
+m_nCurrent = 0;
+SetText( m_aMatching[0] );
+sal_uInt16 nNewLen = m_aMatching[0].getLength();
+
+Selection aSel( nLen, nNewLen );
+SetSelection( aSel );
+}
+}
+}
+}
+
+bool AutocompleteEdit::Match( const OUString& rText )
+{
+bool bRet = false;
+
+m_aMatching.clear();
+
+for( std::vector< OUString >::size_type i = 0; i < m_aEntries.size(); ++i )
+{
+if( m_aEntries[i].startsWith( rText ) )
+{
+m_aMatching.push_back( m_aEntries[i] );
+bRet = true;
+}
+}
+
+return bRet;
+}
+
+bool AutocompleteEdit::PreNotify( NotifyEvent& rNEvt )
+{
+if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
+{
+const KeyEvent& rEvent = *rNEvt.GetKeyEvent();
+const vcl::KeyCode& rKey = rEvent.GetKeyCode();
+vcl::KeyCode aCode( rKey.GetCode() );
+
+if( ( aCode == KEY_UP || aCode == KEY_DOWN ) && !rKey.IsMod2() )
+{
+Selection aSelection( GetSelection() );
+sal_uInt16 nLen = ( sal_uInt16 )aSelection.Min();
+
+if( m_aMatching.size() &&
+  

[Libreoffice-commits] core.git: ucb/source

[Giuseppe Castagno]

 ucb/source/ucp/webdav/ContentProperties.cxx |   11 +--
 ucb/source/ucp/webdav/ContentProperties.hxx |3 ---
 ucb/source/ucp/webdav/webdavcontent.cxx |8 
 3 files changed, 5 insertions(+), 17 deletions(-)

New commits:
commit 482f0517083d13b3efb7d367b2f1f7a792fc6e47
Author: Giuseppe Castagno 
Date:   Mon Aug 17 16:39:46 2015 +0200

cppcheck:noExplicitConstructor in webdav, serf version

Explicitly add constructors that where previously hidden.

The right implementation of what I did
in aade7198d72bc4ddb18f10729b89f0435e6ca197.

The explict keyword was added in 6343754e310a589cb49e2a1da0cd68472571179d

Change-Id: I66f6ee51c8b51d93d6ac673e7e13024e4b48
Reviewed-on: https://gerrit.libreoffice.org/17823
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx 
b/ucb/source/ucp/webdav/ContentProperties.cxx
index 5069ef9..0d5e074 100644
--- a/ucb/source/ucp/webdav/ContentProperties.cxx
+++ b/ucb/source/ucp/webdav/ContentProperties.cxx
@@ -591,11 +591,6 @@ CachableContentProperties::CachableContentProperties(
 addProperties( rProps );
 }
 
-CachableContentProperties::CachableContentProperties(
- const DAVResource & rResource )
-{
-addProperties( rResource );
-}
 
 void CachableContentProperties::addProperties(
 const ContentProperties & rProps )
@@ -616,6 +611,7 @@ void CachableContentProperties::addProperties(
 }
 }
 
+
 void CachableContentProperties::addProperties(
 const std::vector< DAVPropertyValue > & rProps )
 {
@@ -631,9 +627,4 @@ void CachableContentProperties::addProperties(
  }
 }
 
-void CachableContentProperties::addProperties( const DAVResource & rResource )
-{
-addProperties( rResource.properties );
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx 
b/ucb/source/ucp/webdav/ContentProperties.hxx
index 7929b39..daf3f47 100644
--- a/ucb/source/ucp/webdav/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav/ContentProperties.hxx
@@ -173,15 +173,12 @@ private:
 CachableContentProperties( const CachableContentProperties & ); // n.i.
 
 public:
-explicit CachableContentProperties( const DAVResource& rResource );
 explicit CachableContentProperties( const ContentProperties & rProps );
 
 void addProperties( const ContentProperties & rProps );
 
 void addProperties( const std::vector< DAVPropertyValue > & rProps );
 
-void addProperties( const DAVResource & rResource );
-
 bool containsAllNames(
 const com::sun::star::uno::Sequence<
 com::sun::star::beans::Property >& rProps,
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx 
b/ucb/source/ucp/webdav/webdavcontent.cxx
index 32ca2db..3173f26 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -2169,9 +2169,9 @@ uno::Any Content::open(
 // cache headers.
 if ( !m_xCachedProps.get())
 m_xCachedProps.reset(
-new CachableContentProperties( aResource ) );
+new CachableContentProperties( ContentProperties( 
aResource ) ) );
 else
-m_xCachedProps->addProperties( aResource );
+m_xCachedProps->addProperties( ContentProperties( 
aResource ) );
 
 m_xResAccess.reset(
 new DAVResourceAccess( *xResAccess.get() ) );
@@ -2215,7 +2215,7 @@ uno::Any Content::open(
 // cache headers.
 if ( !m_xCachedProps.get())
 m_xCachedProps.reset(
-new CachableContentProperties( aResource ) );
+new CachableContentProperties( 
ContentProperties( aResource ) ) );
 else
 m_xCachedProps->addProperties(
 aResource.properties );
@@ -3362,7 +3362,7 @@ Content::ResourceType Content::getResourceType(
 {
 osl::MutexGuard g(m_aMutex);
 m_xCachedProps.reset(
-new CachableContentProperties( resources[ 0 ] ) );
+new CachableContentProperties( ContentProperties( resources[ 0 
] ) ) );
 m_xCachedProps->containsAllNames(
 aProperties, m_aFailedPropNames );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/fixes7' - vcl/win

[Tor Lillqvist]

 vcl/win/source/gdi/winlayout.cxx |   12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 32b8b33273764c64515f7fdf97e369fed6406876
Author: Tor Lillqvist 
Date:   Mon Aug 17 18:23:11 2015 +0300

Add FIXME comment and bin an #if 0 snippet

Change-Id: I0bbea4ef62c8e94d8b8f1bfb440712da5839e532

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 6f8b4ca..e32b8b5 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -1579,6 +1579,8 @@ bool UniscribeLayout::DrawCachedGlyphs(SalGraphics& 
rGraphics) const
 
 pImpl->PreDraw();
 
+// FIXME: This code snippet is mostly copied from the one in
+// UniscribeLayout::DrawTextImpl. Should be factored out.
 int nBaseClusterOffset = 0;
 int nBaseGlyphPos = -1;
 for( int nItem = 0; nItem < mnItemCount; ++nItem )
@@ -1626,16 +1628,6 @@ bool UniscribeLayout::DrawCachedGlyphs(SalGraphics& 
rGraphics) const
 pImpl->DrawMask(*rChunk.mpTexture, salColor, a2Rects);
 nAdvance += mpGlyphAdvances[i];
 }
-#if 0
-ScriptTextOut(hDC, &rScriptCache,
-aPos.X(), aPos.Y(), 0, NULL,
-&rVisualItem.mpScriptItem->a, NULL, 0,
-mpOutGlyphs + nMinGlyphPos,
-nEndGlyphPos - nMinGlyphPos,
-mpGlyphAdvances + nMinGlyphPos,
-mpJustifications ? mpJustifications + nMinGlyphPos : NULL,
-mpGlyphOffsets + nMinGlyphPos);
-#endif
 }
 pImpl->PostDraw();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 88206] Change uses of cppu::WeakImplHelper* and cppu::ImplInheritanceHelper* to use variadic variants instead

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=88206

--- Comment #28 from Commit Notification 
 ---
Takeshi Abe committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=0a4c482a8aa2e421668a6607916c9656a3f18b19

i18npool: tdf#88206 replace cppu::WeakImplHelper*

It will be available in 5.1.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 88206] Change uses of cppu::WeakImplHelper* and cppu::ImplInheritanceHelper* to use variadic variants instead

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=88206

--- Comment #27 from Commit Notification 
 ---
Takeshi Abe committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=370a26f7804d12da26abe007f1d80a00c4fdaeb4

hwpfilter: tdf#88206 replace cppu::WeakImplHelper*

It will be available in 5.1.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Takeshi Abe]

 i18npool/inc/breakiteratorImpl.hxx   |4 ++--
 i18npool/inc/calendarImpl.hxx|4 ++--
 i18npool/inc/cclass_unicode.hxx  |4 ++--
 i18npool/inc/characterclassificationImpl.hxx |4 ++--
 i18npool/inc/collatorImpl.hxx|4 ++--
 i18npool/inc/collator_unicode.hxx|4 ++--
 i18npool/inc/defaultnumberingprovider.hxx|4 ++--
 i18npool/inc/indexentrysupplier.hxx  |4 ++--
 i18npool/inc/indexentrysupplier_common.hxx   |4 ++--
 i18npool/inc/inputsequencechecker.hxx|4 ++--
 i18npool/inc/localedata.hxx  |4 ++--
 i18npool/inc/nativenumbersupplier.hxx|4 ++--
 i18npool/inc/numberformatcode.hxx|4 ++--
 i18npool/inc/ordinalsuffix.hxx   |4 ++--
 i18npool/inc/textconversion.hxx  |4 ++--
 i18npool/inc/textconversionImpl.hxx  |4 ++--
 i18npool/inc/transliterationImpl.hxx |4 ++--
 i18npool/inc/transliteration_commonclass.hxx |4 ++--
 i18npool/inc/unoscripttypedetector.hxx   |4 ++--
 i18npool/qa/cppunit/test_breakiterator.cxx   |1 -
 i18npool/qa/cppunit/test_characterclassification.cxx |1 -
 i18npool/qa/cppunit/test_textsearch.cxx  |1 -
 i18npool/source/localedata/LocaleNode.hxx|3 ---
 i18npool/source/localedata/localedata.cxx|4 ++--
 i18npool/source/localedata/saxparser.cxx |7 +++
 i18npool/source/search/textsearch.hxx|4 ++--
 26 files changed, 45 insertions(+), 52 deletions(-)

New commits:
commit 0a4c482a8aa2e421668a6607916c9656a3f18b19
Author: Takeshi Abe 
Date:   Sat Aug 15 15:26:43 2015 +0900

i18npool: tdf#88206 replace cppu::WeakImplHelper*

with the variadic variants.

Change-Id: I0381de7fde198df74556355984bdaba2ecdedd4b
Reviewed-on: https://gerrit.libreoffice.org/17768
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/i18npool/inc/breakiteratorImpl.hxx 
b/i18npool/inc/breakiteratorImpl.hxx
index f97133c..4dc6ee9 100644
--- a/i18npool/inc/breakiteratorImpl.hxx
+++ b/i18npool/inc/breakiteratorImpl.hxx
@@ -30,7 +30,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #include 
 
@@ -39,7 +39,7 @@ namespace com { namespace sun { namespace star { namespace 
i18n {
 
 //  class BreakIterator
 
-class BreakIteratorImpl : public cppu::WeakImplHelper2
+class BreakIteratorImpl : public cppu::WeakImplHelper
 <
 XBreakIterator,
 com::sun::star::lang::XServiceInfo
diff --git a/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx
index 0f67c1e..7d5964f 100644
--- a/i18npool/inc/calendarImpl.hxx
+++ b/i18npool/inc/calendarImpl.hxx
@@ -23,7 +23,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -34,7 +34,7 @@
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-class CalendarImpl : public cppu::WeakImplHelper2
+class CalendarImpl : public cppu::WeakImplHelper
 <
 com::sun::star::i18n::XCalendar4,
 com::sun::star::lang::XServiceInfo
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
index 3ff2aed..90f2c0e 100644
--- a/i18npool/inc/cclass_unicode.hxx
+++ b/i18npool/inc/cclass_unicode.hxx
@@ -22,7 +22,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 #include 
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star { namespace 
i18n {
 
 typedef sal_uInt32 UPT_FLAG_TYPE;
 
-class cclass_Unicode : public cppu::WeakImplHelper2 < 
XCharacterClassification, css::lang::XServiceInfo >
+class cclass_Unicode : public cppu::WeakImplHelper < XCharacterClassification, 
css::lang::XServiceInfo >
 {
 public:
 cclass_Unicode(const com::sun::star::uno::Reference < 
com::sun::star::uno::XComponentContext >& rxContext );
diff --git a/i18npool/inc/characterclassificationImpl.hxx 
b/i18npool/inc/characterclassificationImpl.hxx
index 59f84b7..091d7df 100644
--- a/i18npool/inc/characterclassificationImpl.hxx
+++ b/i18npool/inc/characterclassificationImpl.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_I18NPOOL_INC_CHARACTERCLASSIFICATIONIMPL_HXX
 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -28,7 +28,7 @@
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-class CharacterClassificationImpl : public cppu::WeakImplHelper2
+class CharacterClassificationImpl : public cppu::WeakImplHelper
 <
 XCharacterClassification,
 com::sun::star::lang::XServiceInfo
diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx
index 60fd79f..0acd37a 100644
--- a/i18npool/inc/collatorImpl.hxx
+++ b/i18npool/inc/collatorImpl.hxx
@@ -25,7 +25,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -

[Libreoffice-commits] core.git: hwpfilter/source

[Takeshi Abe]

 hwpfilter/source/attributes.cxx |2 +-
 hwpfilter/source/attributes.hxx |4 ++--
 hwpfilter/source/hwpreader.hxx  |8 +++-
 3 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit 370a26f7804d12da26abe007f1d80a00c4fdaeb4
Author: Takeshi Abe 
Date:   Sat Aug 15 15:09:19 2015 +0900

hwpfilter: tdf#88206 replace cppu::WeakImplHelper*

with the variadic variants.

Change-Id: Ibfe59dc7631cf499f42ff998066ed73d1eb257b3
Reviewed-on: https://gerrit.libreoffice.org/17767
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/hwpfilter/source/attributes.cxx b/hwpfilter/source/attributes.cxx
index a5749e8..14868ec 100644
--- a/hwpfilter/source/attributes.cxx
+++ b/hwpfilter/source/attributes.cxx
@@ -53,7 +53,7 @@ sal_Int16 SAL_CALL AttributeListImpl::getLength() throw 
(RuntimeException, std::
 
 
 AttributeListImpl::AttributeListImpl( const AttributeListImpl &r ) :
-cppu::WeakImplHelper1( r )
+cppu::WeakImplHelper( r )
 {
 m_pImpl = new AttributeListImpl_impl;
 *m_pImpl = *(r.m_pImpl);
diff --git a/hwpfilter/source/attributes.hxx b/hwpfilter/source/attributes.hxx
index de1bde8..e762579 100644
--- a/hwpfilter/source/attributes.hxx
+++ b/hwpfilter/source/attributes.hxx
@@ -22,7 +22,7 @@
 #define INCLUDED_HWPFILTER_SOURCE_ATTRIBUTES_HXX
 
 #include 
-#include 
+#include 
 
 /*
 *
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::xml::sax;
 using namespace ::com::sun::star::uno;
 
 struct AttributeListImpl_impl;
-class AttributeListImpl : public WeakImplHelper1< XAttributeList >
+class AttributeListImpl : public WeakImplHelper< XAttributeList >
 {
 protected:
 virtual ~AttributeListImpl();
diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx
index 15baadd..c94c078 100644
--- a/hwpfilter/source/hwpreader.hxx
+++ b/hwpfilter/source/hwpreader.hxx
@@ -37,9 +37,7 @@
 #include 
 
 #include 
-#include 
-#include 
-#include 
+#include 
 #include 
 #include 
 
@@ -73,7 +71,7 @@ struct HwpReaderPrivate;
 /**
  * This class implements the external Parser interface
  */
-class HwpReader : public WeakImplHelper1
+class HwpReader : public WeakImplHelper
 {
 
 public:
@@ -151,7 +149,7 @@ private:
 static char* getPStyleName(int, char *);
 };
 
-class HwpImportFilter : public WeakImplHelper4< XFilter, XImporter, 
XServiceInfo, XExtendedFilterDetection >
+class HwpImportFilter : public WeakImplHelper< XFilter, XImporter, 
XServiceInfo, XExtendedFilterDetection >
 {
 public:
 HwpImportFilter(const Reference< XMultiServiceFactory >& rFact);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source

[Miklos Vajna]

 cui/source/inc/cuitabarea.hxx|   32 +-
 cui/source/tabpages/tpshadow.cxx |  122 +++
 2 files changed, 77 insertions(+), 77 deletions(-)

New commits:
commit d74271bec86e13beca09e5c5f2842efd45756d9c
Author: Miklos Vajna 
Date:   Tue Aug 18 09:08:47 2015 +0200

cui: prefix members of SvxShadowTabPage

Change-Id: I68fa37f511c3eb7aec2bd2754afd1a47ac8d1e83

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index fe4fbbb..2216fb8 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -332,20 +332,20 @@ private:
 VclPtrm_pMtrTransparent;
 VclPtr  m_pCtlXRectPreview;
 
-const SfxItemSet&   rOutAttrs;
-RECT_POINT  eRP;
+const SfxItemSet&   m_rOutAttrs;
+RECT_POINT  m_eRP;
 
-XColorListRef   pColorList;
-ChangeType* pnColorListState;
-sal_uInt16  nPageType;
-sal_uInt16  nDlgType;
-bool*   pbAreaTP;
+XColorListRef   m_pColorList;
+ChangeType* m_pnColorListState;
+sal_uInt16  m_nPageType;
+sal_uInt16  m_nDlgType;
+bool*   m_pbAreaTP;
 
-boolbDisable;
+boolm_bDisable;
 
-XFillAttrSetItemaXFillAttr;
-SfxItemSet& rXFSet;
-SfxMapUnit  ePoolUnit;
+XFillAttrSetItemm_aXFillAttr;
+SfxItemSet& m_rXFSet;
+SfxMapUnit  m_ePoolUnit;
 
 DECL_LINK( ClickShadowHdl_Impl, void * );
 DECL_LINK( ModifyShadowHdl_Impl, void * );
@@ -365,11 +365,11 @@ public:
 virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
 virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) 
SAL_OVERRIDE;
 
-voidSetColorList( XColorListRef pColTab ) { pColorList = pColTab; }
-voidSetPageType( sal_uInt16 nInType ) { nPageType = nInType; }
-voidSetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
-voidSetAreaTP( bool* pIn ) { pbAreaTP = pIn; }
-voidSetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; }
+voidSetColorList( XColorListRef pColorList ) { m_pColorList = 
pColorList; }
+voidSetPageType( sal_uInt16 nInType ) { m_nPageType = nInType; }
+voidSetDlgType( sal_uInt16 nInType ) { m_nDlgType = nInType; }
+voidSetAreaTP( bool* pIn ) { m_pbAreaTP = pIn; }
+voidSetColorChgd( ChangeType* pIn ) { m_pnColorListState = pIn; }
 virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
 };
 
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 2e49a73..327f33c 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -53,15 +53,15 @@ SvxShadowTabPage::SvxShadowTabPage( vcl::Window* pParent, 
const SfxItemSet& rInA
   "ShadowTabPage",
   "cui/ui/shadowtabpage.ui",
   rInAttrs ),
-rOutAttrs   ( rInAttrs ),
-eRP ( RP_LT ),
-pnColorListState( 0 ),
-nPageType   ( 0 ),
-nDlgType( 0 ),
-pbAreaTP( 0 ),
-bDisable( false ),
-aXFillAttr  ( rInAttrs.GetPool() ),
-rXFSet  ( aXFillAttr.GetItemSet() )
+m_rOutAttrs   ( rInAttrs ),
+m_eRP ( RP_LT ),
+m_pnColorListState( 0 ),
+m_nPageType   ( 0 ),
+m_nDlgType( 0 ),
+m_pbAreaTP( 0 ),
+m_bDisable( false ),
+m_aXFillAttr  ( rInAttrs.GetPool() ),
+m_rXFSet  ( m_aXFillAttr.GetItemSet() )
 {
 get(m_pTsbShowShadow,"TSB_SHOW_SHADOW");
 get(m_pGridShadow,"gridSHADOW");
@@ -88,52 +88,52 @@ SvxShadowTabPage::SvxShadowTabPage( vcl::Window* pParent, 
const SfxItemSet& rInA
 SetFieldUnit( *m_pMtrDistance, eFUnit );
 
 // determine PoolUnit
-SfxItemPool* pPool = rOutAttrs.GetPool();
+SfxItemPool* pPool = m_rOutAttrs.GetPool();
 DBG_ASSERT( pPool, "Wo ist der Pool?" );
-ePoolUnit = pPool->GetMetric( SDRATTR_SHADOWXDIST );
+m_ePoolUnit = pPool->GetMetric( SDRATTR_SHADOWXDIST );
 
 // setting the output device
 drawing::FillStyle eXFS = drawing::FillStyle_SOLID;
-if( rOutAttrs.GetItemState( XATTR_FILLSTYLE ) != SfxItemState::DONTCARE )
+if( m_rOutAttrs.GetItemState( XATTR_FILLSTYLE ) != SfxItemState::DONTCARE )
 {
-eXFS = (drawing::FillStyle) ( static_cast( 
rOutAttrs.
+eXFS = (drawing::FillStyle) ( static_cast( 
m_rOutAttrs.
 Get( GetWhich( XATTR_FILLSTYLE ) ) 
).GetValue() );
 switch( eXFS )
 {
 case drawing::FillStyle_SOLID:
-if( SfxItemState::DONTCARE != rOutAttrs.GetItemState( 
XATTR_FILLCOLOR ) )
+if( SfxItemState::DONTCARE != m_rOutAttrs.GetItemState( 
XATTR_FILLCOLOR ) )
 {