[Libreoffice-commits] core.git: 2 commits - bin/gbuild-to-ide
bin/gbuild-to-ide | 315 +++---
1 file changed, 159 insertions(+), 156 deletions(-)
New commits:
commit 83ef294dddf3b1ab5cd5f91a792a7d9413a08f1f
Author: Peter Foley
Date: Sat Sep 19 16:59:45 2015 -0400
Avoid creating duplicates in the Visual Studio IDE integration
When running make vs2013-ide-integration on windows, the manifest
targets cause duplicate library/executable entries to be output in
the Visual Studio solution files, causing errors.
Change-Id: I6b0ce38a3ba84f7f54741e4974264e2c4c7b201a
Reviewed-on: https://gerrit.libreoffice.org/18719
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index de0a060..953747e 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -117,19 +117,21 @@ class GbuildParser:
libmatch = GbuildParser.libpattern.match(line)
if libmatch:
libname = self.libnames.get(state.ilib, None)
-self.libs.append(
-GbuildLib(libmatch.group(2), libname, libmatch.group(1),
- state.include, state.include_sys, state.defs,
state.cxxobjects,
- state.cxxflags, state.linked_libs))
+if state.cxxobjects:
+self.libs.append(
+GbuildLib(libmatch.group(2), libname, libmatch.group(1),
+ state.include, state.include_sys, state.defs,
state.cxxobjects,
+ state.cxxflags, state.linked_libs))
state = GbuildParserState()
return state
exematch = GbuildParser.exepattern.match(line)
if exematch:
exename = self.exenames.get(state.target, None)
-self.exes.append(
-GbuildExe(exematch.group(2), exename, exematch.group(1),
- state.include, state.include_sys, state.defs,
state.cxxobjects,
- state.cxxflags, state.linked_libs))
+if state.cxxobjects:
+self.exes.append(
+GbuildExe(exematch.group(2), exename, exematch.group(1),
+ state.include, state.include_sys, state.defs,
state.cxxobjects,
+ state.cxxflags, state.linked_libs))
state = GbuildParserState()
return state
if line.find('# INCLUDE :=') == 0:
commit 2d48830dcbe14c9c2789707d1032876c45409799
Author: Peter Foley
Date: Sat Sep 19 16:53:04 2015 -0400
minor pep8 formatting improvments to gbuild-to-ide
Change-Id: Ifa060f4ab6ebe7b525a991cc54564e9584d032f7
Reviewed-on: https://gerrit.libreoffice.org/18720
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 8d822e5..de0a060 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -20,6 +20,7 @@ import xml.etree.ElementTree as ET
import xml.dom.minidom as minidom
import traceback
+
class GbuildParserState:
def __init__(self):
@@ -242,7 +243,9 @@ class IdeIntegrationGenerator:
def emit(self):
pass
+
class EclipseCDTIntegrationGenerator(IdeIntegrationGenerator):
+
def __init__(self, gbuildparser, ide):
IdeIntegrationGenerator.__init__(self, gbuildparser, ide)
self.oe_cdt = 'org.eclipse.cdt'
@@ -260,13 +263,13 @@ class
EclipseCDTIntegrationGenerator(IdeIntegrationGenerator):
-"""+ self.cdt_mb +""".genmakebuilder
+""" + self.cdt_mb + """.genmakebuilder
clean,full,incremental,
-"""+ self.cdt_mb +""".ScannerConfigBuilder
+""" + self.cdt_mb +
""".ScannerConfigBuilder
full,incremental,
@@ -281,7 +284,8 @@ class
EclipseCDTIntegrationGenerator(IdeIntegrationGenerator):
"""
-return projectfiletemplate % {'name': name, 'comment': comment,
'xmlversion': xmlversion, 'encoding':encoding}
+return projectfiletemplate % {'name': name, 'comment': comment,
'xmlversion': xmlversion, 'encoding': encoding}
+
class DebugIntegrationGenerator(IdeIntegrationGenerator):
@@ -485,7 +489,6 @@ VersionControl=kdevgit
def __init__(self, gbuildparser, ide):
IdeIntegrationGenerator.__init__(self, gbuildparser, ide)
-
def emit(self):
for path in self.gbuildparser.target_by_path:
self.write_includepaths(path)
@@ -668,12 +671,13 @@ class XcodeIntegrationGenerator(IdeIntegrationGenerator):
def emit(self):
self.rootlocation = './'
for location in self.gbuildparser.target_by_location:
-module = location.split('/')[-1]
-module_directory = os.path.join(
[Libreoffice-commits] core.git: accessibility/inc accessibility/source avmedia/source basctl/source chart2/source extensions/source filter/source framework/inc framework/source include/sfx2 include/sv
accessibility/inc/accessibility/extended/accessibletabbarbase.hxx |2 accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx |2 accessibility/inc/accessibility/extended/listboxaccessible.hxx |2 accessibility/inc/accessibility/extended/textwindowaccessibility.hxx |6 accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx |2 accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx| 24 +-- accessibility/source/extended/accessibletabbarbase.cxx | 28 +--- accessibility/source/extended/accessibletablistboxtable.cxx| 11 - accessibility/source/extended/listboxaccessible.cxx| 13 -- accessibility/source/extended/textwindowaccessibility.cxx |5 accessibility/source/standard/vclxaccessiblemenubar.cxx| 13 -- avmedia/source/opengl/oglwindow.cxx| 27 +--- avmedia/source/opengl/oglwindow.hxx|4 basctl/source/accessibility/accessibledialogwindow.cxx | 14 -- basctl/source/inc/accessibledialogwindow.hxx |2 chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx|5 chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx|2 extensions/source/update/ui/updatecheckui.cxx | 18 +- filter/source/pdf/pdffilter.cxx|7 - framework/inc/classes/fwktabwindow.hxx |4 framework/source/classes/fwktabwindow.cxx |4 framework/source/dispatch/windowcommanddispatch.cxx| 24 +-- framework/source/inc/dispatch/windowcommanddispatch.hxx|3 framework/source/services/tabwindowservice.cxx | 24 +-- include/sfx2/sidebar/FocusManager.hxx |2 include/sfx2/sidebar/SidebarController.hxx |2 include/svtools/dialogcontrolling.hxx |2 include/svtools/genericunodialog.hxx |2 include/svtools/toolpanel/drawerlayouter.hxx |2 include/toolkit/awt/vclxaccessiblecomponent.hxx|2 include/toolkit/awt/vclxwindow.hxx |2 include/vcl/layout.hxx |2 include/vcl/window.hxx |5 reportdesign/source/ui/inc/ReportController.hxx|2 reportdesign/source/ui/report/ReportController.cxx |5 sc/source/ui/app/inputhdl.cxx | 10 - sc/source/ui/inc/inputhdl.hxx |4 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx |7 - sd/source/ui/annotations/annotationtag.cxx | 12 - sd/source/ui/annotations/annotationtag.hxx |2 sd/source/ui/framework/factories/FullScreenPane.cxx|9 - sd/source/ui/framework/factories/FullScreenPane.hxx|2 sd/source/ui/inc/FormShellManager.hxx |2 sd/source/ui/sidebar/LayoutMenu.cxx| 24 +-- sd/source/ui/sidebar/LayoutMenu.hxx|2 sd/source/ui/slideshow/showwin.cxx |5 sd/source/ui/slideshow/showwindow.hxx |2 sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 17 +- sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx |3 sd/source/ui/slidesorter/shell/SlideSorter.cxx |4 sd/source/ui/view/FormShellManager.cxx | 57 - sd/source/ui/view/ViewShellManager.cxx | 13 -- sfx2/source/sidebar/FocusManager.cxx | 25 +--- sfx2/source/sidebar/SidebarController.cxx | 15 -- sfx2/source/toolbox/tbxitem.cxx| 14 -- svtools/source/control/toolbarmenuacc.cxx | 13 -- svtools/source/control/toolbarmenuimp.hxx |2 svtools/source/misc/dialogcontrolling.cxx |7 - svtools/source/toolpanel/drawerlayouter.cxx| 19 +-- svtools/source/uno/genericunodialog.cxx|7 - svtools/source/uno/popupwindowcontroller.cxx | 59 - svx/source/accessibility/Acc
[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source vcl/unx
include/vcl/menu.hxx |3 --
vcl/inc/vcleventlisteners.hxx | 12
vcl/source/app/vclevent.cxx | 40 ---
vcl/source/window/menu.cxx| 56 +-
vcl/unx/gtk/window/gtksalmenu.cxx |9 ++
5 files changed, 42 insertions(+), 78 deletions(-)
New commits:
commit e3c3b7fde3c017bd7d25f04fabf9b4528e37fb49
Author: Noel Grandin
Date: Fri Sep 18 10:46:37 2015 +0200
convert Link<> to typed
Change-Id: I86bf78c69251b5cd4d18edf3542e70eb2e8f32e1
Reviewed-on: https://gerrit.libreoffice.org/18699
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 4566082..160ef8b 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -404,8 +404,7 @@ public:
namespace vcl { namespace MenuInvalidator {
-VCL_DLLPUBLIC void AddMenuInvalidateListener(const Link<>&);
-VCL_DLLPUBLIC void CallMenuInvalidateListeners(VclSimpleEvent* pEvent);
+VCL_DLLPUBLIC void AddMenuInvalidateListener(const Link&);
VCL_DLLPUBLIC void Invalidated();
}}
diff --git a/vcl/inc/vcleventlisteners.hxx b/vcl/inc/vcleventlisteners.hxx
index 8e3b026..5be40e8 100644
--- a/vcl/inc/vcleventlisteners.hxx
+++ b/vcl/inc/vcleventlisteners.hxx
@@ -41,18 +41,6 @@ private:
std::vector> m_aListeners;
};
-class VCL_DLLPUBLIC VclEventListeners2 : public vcl::DeletionNotifier
-{
-std::vector> m_aListeners;
-public:
-VclEventListeners2();
-~VclEventListeners2();
-
-void addListener( const Link<>& );
-void removeListener( const Link<>& );
-void callListeners( VclSimpleEvent* );
-};
-
#endif // INCLUDED_VCL_INC_VCLEVENTLISTENERS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx
index 7cb291d..6cc4523 100644
--- a/vcl/source/app/vclevent.cxx
+++ b/vcl/source/app/vclevent.cxx
@@ -87,46 +87,6 @@ void VclEventListeners::removeListener( const Link<>&
rListener )
m_aListeners.erase( std::remove(m_aListeners.begin(), m_aListeners.end(),
rListener ), m_aListeners.end() );
}
-VclEventListeners2::VclEventListeners2()
-{
-}
-
-VclEventListeners2::~VclEventListeners2()
-{
-}
-
-void VclEventListeners2::addListener( const Link<>& rListener )
-{
-// ensure uniqueness
-if (std::find(m_aListeners.begin(), m_aListeners.end(), rListener) ==
m_aListeners.end())
- m_aListeners.push_back( rListener );
-}
-
-void VclEventListeners2::removeListener( const Link<>& rListener )
-{
-m_aListeners.erase( std::remove(m_aListeners.begin(), m_aListeners.end(),
rListener ), m_aListeners.end() );
-}
-
-void VclEventListeners2::callListeners( VclSimpleEvent* pEvent )
-{
-vcl::DeletionListener aDel( this );
-
-// Copy the list, because this can be destroyed when calling a Link...
-std::vector> aCopy( m_aListeners );
-std::vector>::iterator aIter( aCopy.begin() );
-std::vector>::const_iterator aEnd( aCopy.end() );
-
-while ( aIter != aEnd && ! aDel.isDeleted() )
-{
-Link<> &rLink = *aIter;
-// check this hasn't been removed in some re-enterancy scenario
fdo#47368
-if( std::find(m_aListeners.begin(), m_aListeners.end(), rLink) !=
m_aListeners.end() )
-rLink.Call( pEvent );
-++aIter;
-}
-}
-
-
VclWindowEvent::VclWindowEvent( vcl::Window* pWin, sal_uLong n, void* pDat ) :
VclSimpleEvent(n)
{
pWindow = pWin; pData = pDat;
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index e5acc2e..23f857a 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -3239,25 +3239,43 @@ ImplMenuDelData::~ImplMenuDelData()
}
namespace vcl { namespace MenuInvalidator {
-static VclEventListeners2* pMenuInvalidateListeners = NULL;
-void AddMenuInvalidateListener(const Link<>& rLink)
-{
-if(!pMenuInvalidateListeners)
-pMenuInvalidateListeners = new VclEventListeners2();
-pMenuInvalidateListeners->addListener(rLink);
-}
-void CallMenuInvalidateListeners(VclSimpleEvent* pEvent)
+
+struct MenuInvalidateListeners : public vcl::DeletionNotifier
+{
+std::vector> m_aListeners;
+};
+
+static MenuInvalidateListeners* pMenuInvalidateListeners = NULL;
+
+void AddMenuInvalidateListener(const Link& rLink)
+{
+if(!pMenuInvalidateListeners)
+pMenuInvalidateListeners = new MenuInvalidateListeners();
+// ensure uniqueness
+auto& rListeners = pMenuInvalidateListeners->m_aListeners;
+if (std::find(rListeners.begin(), rListeners.end(), rLink) ==
rListeners.end())
+ rListeners.push_back( rLink );
+}
+
+void Invalidated()
+{
+if(!pMenuInvalidateListeners)
+return;
+
+vcl::DeletionListener aDel( pMenuInvalidateListeners );
+
+auto& rYieldListeners = pMenuInvalidateListeners->m_aListeners;
+// Copy the list, because this can be destroyed when calling a Link...
+std::vector> aCopy( rY
[Libreoffice-commits] core.git: include/vcl sd/source vcl/inc vcl/source
include/vcl/svapp.hxx|4 ++--
sd/source/ui/slideshow/slideshowimpl.cxx |6 +++---
sd/source/ui/slideshow/slideshowimpl.hxx |8
vcl/inc/svdata.hxx |7 ++-
vcl/source/app/svapp.cxx | 31 +--
5 files changed, 40 insertions(+), 16 deletions(-)
New commits:
commit 81e1e318bb47d4dc2f479ac1809d355c117f8ce8
Author: Noel Grandin
Date: Fri Sep 18 09:39:28 2015 +0200
convert Link<> to typed
Change-Id: If7fdd97d3c317a8e31641cc096c2c2639c1e012e
Reviewed-on: https://gerrit.libreoffice.org/18698
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 06079c6..1365215 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -596,7 +596,7 @@ public:
GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex,
EnableNoYieldMode, DisableNoYieldMode, RemovePostYieldListener
*/
-static void AddPostYieldListener( const Link<>&
i_rListener );
+static void AddPostYieldListener( const
Link& i_rListener );
/** Remove listener for yield events
@@ -606,7 +606,7 @@ public:
GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex,
AddPostYieldListener, EnableNoYieldMode, DisableNoYieldMode
*/
-static void RemovePostYieldListener( const Link<>&
i_rListener );
+static void RemovePostYieldListener( const
Link& i_rListener );
/** Queries whether the application is in "main", i.e. not yet in
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index d36cd09..25a0a1f 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1788,7 +1788,7 @@ IMPL_LINK_NOARG_TYPED(SlideshowImpl, updateHdl, Timer *,
void)
updateSlideShow();
}
-IMPL_LINK_NOARG(SlideshowImpl, PostYieldListener)
+IMPL_LINK_NOARG_TYPED(SlideshowImpl, PostYieldListener, LinkParamNone*, void)
{
// prevent me from deletion when recursing (App::Reschedule does)
const rtl::Reference this_(this);
@@ -1799,9 +1799,9 @@ IMPL_LINK_NOARG(SlideshowImpl, PostYieldListener)
// *all* outstanding events after
// yield is done.
if (mbDisposed)
-return 0;
+return;
Application::Reschedule(true);
-return updateSlideShow();
+updateSlideShow();
}
sal_Int32 SlideshowImpl::updateSlideShow()
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx
b/sd/source/ui/slideshow/slideshowimpl.hxx
index a7af283..06ac09e 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -274,13 +274,13 @@ private:
void setActiveXToolbarsVisible( bool bVisible );
-DECL_LINK_TYPED(updateHdl, Timer *, void);
-DECL_LINK( PostYieldListener, void* );
-DECL_LINK_TYPED(ReadyForNextInputHdl, Timer *, void);
+DECL_LINK_TYPED( updateHdl, Timer *, void );
+DECL_LINK_TYPED( PostYieldListener, LinkParamNone*, void );
+DECL_LINK_TYPED( ReadyForNextInputHdl, Timer *, void );
DECL_LINK_TYPED( endPresentationHdl, void*, void );
DECL_LINK_TYPED( ContextMenuSelectHdl, Menu *, bool );
DECL_LINK_TYPED( ContextMenuHdl, void*, void );
-DECL_LINK_TYPED(deactivateHdl, Timer *, void);
+DECL_LINK_TYPED( deactivateHdl, Timer *, void );
DECL_LINK( EventListenerHdl, VclSimpleEvent* );
// helper
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index e7496aa..91bd10f 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -104,6 +104,11 @@ public:
typedef std::vector > SVAppKeyListeners;
+struct SVAppPostYieldListeners : public vcl::DeletionNotifier
+{
+std::vector> m_aListeners;
+};
+
struct ImplSVAppData
{
enum ImeStatusWindowMode
@@ -128,7 +133,7 @@ struct ImplSVAppData
VclPtr mpWheelWindow; // WheelWindow
ImplHotKey* mpFirstHotKey; //
HotKey-Verwaltung
ImplEventHook* mpFirstEventHook; // Event-Hooks
-VclEventListeners2* mpPostYieldListeners; // post yield
listeners
+SVAppPostYieldListeners* mpPostYieldListeners; // post yield
listeners
sal_uInt64 mnLastInputTime;//
GetLastInputTime()
sal_uInt16 mnDispatchLevel;// DispatchLevel
sal_uInt16 mnModalMode;// ModalMode Count
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 2b5d8d7..c57ca13 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -377,7 +377,20 @@ inline void ImplYield(bool i_bWait, bool i_bAllEvents,
sal_uLong const nReleased
// call post yield listeners
if( pSVData->maAppData.mpPostYieldListeners
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/svapp.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 75d339175e06334de42108c2e26adca65700608a
Author: Noel Grandin
Date: Fri Sep 18 09:09:30 2015 +0200
remove unused Link<> field
Change-Id: I6ceb33a1c7311962f1d8902fab01fc7d6c91975e
Reviewed-on: https://gerrit.libreoffice.org/18697
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 350e829..2b5d8d7 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -144,7 +144,6 @@ struct ImplHotKey
ImplHotKey* mpNext;
void* mpUserData;
vcl::KeyCodemaKeyCode;
-Link<> maLink;
};
struct ImplEventHook
@@ -1425,7 +1424,6 @@ bool ImplCallHotKey( const vcl::KeyCode& rKeyCode )
{
if ( pHotKeyData->maKeyCode == rKeyCode )
{
-pHotKeyData->maLink.Call( pHotKeyData->mpUserData );
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/dbui/mmaddressblockpage.cxx | 11 +--
sw/source/ui/dbui/mmaddressblockpage.hxx |2 +-
2 files changed, 6 insertions(+), 7 deletions(-)
New commits:
commit c830135c96a6ab2281a0adbd0e9563e1dc95cbf1
Author: Noel Grandin
Date: Fri Sep 18 09:07:06 2015 +0200
convert Link<> to typed
Change-Id: I3b80cc0147c8f21e391267fd1683af65934fd220
Reviewed-on: https://gerrit.libreoffice.org/18696
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx
b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 4b4d6b7..199617a 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -801,9 +801,9 @@ class SwAssignFieldsControl : public Control
::std::vector > m_aMatches;
::std::vector > m_aPreviews;
-SwMailMergeConfigItem* m_rConfigItem;
+SwMailMergeConfigItem* m_rConfigItem;
-Link<> m_aModifyHdl;
+Link m_aModifyHdl;
longm_nLBStartTopPos;
longm_nYOffset;
@@ -823,10 +823,10 @@ public:
virtual void dispose() SAL_OVERRIDE;
voidInit(SwMailMergeConfigItem& rConfigItem);
-voidSetModifyHdl(const Link<>& rModifyHdl)
+voidSetModifyHdl(const Link& rModifyHdl)
{
m_aModifyHdl = rModifyHdl;
-m_aModifyHdl.Call(this);
+m_aModifyHdl.Call(nullptr);
}
virtual void Resize() SAL_OVERRIDE;
virtual Size GetOptimalSize() const SAL_OVERRIDE;
@@ -1234,13 +1234,12 @@ IMPL_LINK_NOARG_TYPED(SwAssignFieldsDialog, OkHdl_Impl,
Button*, void)
EndDialog(RET_OK);
}
-IMPL_LINK_NOARG(SwAssignFieldsDialog, AssignmentModifyHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SwAssignFieldsDialog, AssignmentModifyHdl_Impl,
LinkParamNone*, void)
{
uno::Sequence< OUString > aAssignments = CreateAssignments();
const OUString sPreview = SwAddressPreview::FillData(
m_rPreviewString, m_rConfigItem, &aAssignments);
m_pPreviewWIN->SetAddress(sPreview);
-return 0;
}
DDListBox::DDListBox(vcl::Window* pParent, WinBits nStyle)
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx
b/sw/source/ui/dbui/mmaddressblockpage.hxx
index 8e9fe5d..bbcab6e 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -258,7 +258,7 @@ class SwAssignFieldsDialog : public SfxModalDialog
::com::sun::star::uno::Sequence< OUString > CreateAssignments();
DECL_LINK_TYPED(OkHdl_Impl, Button*, void);
-DECL_LINK(AssignmentModifyHdl_Impl, void*);
+DECL_LINK_TYPED(AssignmentModifyHdl_Impl, LinkParamNone*, void);
public:
SwAssignFieldsDialog(vcl::Window* pParent,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/dbui/mmaddressblockpage.cxx | 11 +--
sw/source/ui/dbui/mmaddressblockpage.hxx | 14 +++---
2 files changed, 12 insertions(+), 13 deletions(-)
New commits:
commit 9b47e752419b03b96e17cb776eb4db374a6d09c1
Author: Noel Grandin
Date: Fri Sep 18 09:03:07 2015 +0200
convert Link<> to typed
Change-Id: I8db191c87e80b11fe20370703f4bd6780d18f378
Reviewed-on: https://gerrit.libreoffice.org/18695
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx
b/sw/source/ui/dbui/mmaddressblockpage.cxx
index e0821ee..4b4d6b7 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -668,19 +668,19 @@ bool
SwCustomizeAddressBlockDialog::HasItem_Impl(sal_Int32 nUserData)
return m_pDragED->GetText().indexOf("<" + sEntry + ">") >= 0;
}
-IMPL_LINK(SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl,
AddressMultiLineEdit*, pEdit)
+IMPL_LINK_TYPED(SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl,
AddressMultiLineEdit&, rEdit, void)
{
// called in case the selection of the edit field changes.
// determine selection - if it's one of the editable fields then
// enable the related ComboBox and fill it
static bool bOnEntry = false;
if(bOnEntry)
-return 0;
+return;
bOnEntry = true;
sal_Int32 nSelected = GetSelectedItem_Impl();
if(USER_DATA_NONE != nSelected)
-pEdit->SelectCurrentItem();
+rEdit.SelectCurrentItem();
if(m_pFieldCB->IsVisible() && (USER_DATA_NONE != nSelected) && (nSelected
< 0))
{
@@ -718,7 +718,6 @@ IMPL_LINK(SwCustomizeAddressBlockDialog,
SelectionChangedHdl_Impl, AddressMultiL
UpdateImageButtons_Impl();
bOnEntry = false;
-return 0;
}
IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl)
@@ -1354,7 +1353,7 @@ void AddressMultiLineEdit::Notify(SfxBroadcaster&
/*rBC*/, const SfxHint& rHint)
if (rTextHint.GetId() == TEXT_HINT_VIEWSELECTIONCHANGED ||
rTextHint.GetId() == TEXT_HINT_VIEWCARETCHANGED)
{
-m_aSelectionLink.Call(this);
+m_aSelectionLink.Call(*this);
}
}
}
@@ -1457,7 +1456,7 @@ void AddressMultiLineEdit::InsertNewEntryAtPosition(
const OUString& rStr, sal_u
TextSelection aEntrySel(aInsertPos);
ExtTextView* pTextView = GetTextView();
pTextView->SetSelection(aEntrySel);
-m_aSelectionLink.Call(this);
+m_aSelectionLink.Call(*this);
}
void AddressMultiLineEdit::RemoveCurrentEntry()
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx
b/sw/source/ui/dbui/mmaddressblockpage.hxx
index c216408..8e9fe5d 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -110,12 +110,12 @@ public:
virtual ~SwSelectAddressBlockDialog();
virtual void dispose() SAL_OVERRIDE;
-voidSetAddressBlocks(const com::sun::star::uno::Sequence< OUString>&
rBlocks,
+void SetAddressBlocks(const css::uno::Sequence< OUString>& rBlocks,
sal_uInt16 nSelected);
-const com::sun::star::uno::Sequence< OUString>&GetAddressBlocks();
+const css::uno::Sequence< OUString>&GetAddressBlocks();
-voidSetSettings(bool bIsCountry, const OUString& sCountry);
-boolIsIncludeCountry() const {return !m_pNeverRB->IsChecked();}
+void SetSettings(bool bIsCountry, const OUString& sCountry);
+bool IsIncludeCountry() const {return !m_pNeverRB->IsChecked();}
OUString GetCountry() const;
};
@@ -140,7 +140,7 @@ public:
class AddressMultiLineEdit : public VclMultiLineEdit, public SfxListener
{
-Link<> m_aSelectionLink;
+Link m_aSelectionLink;
VclPtr m_pParentDialog;
using VclMultiLineEdit::Notify;
@@ -160,7 +160,7 @@ public:
virtual SizeGetOptimalSize() const SAL_OVERRIDE;
-voidSetSelectionChangedHdl( const Link<>& rLink )
{m_aSelectionLink = rLink;}
+voidSetSelectionChangedHdl( const
Link& rLink ) {m_aSelectionLink = rLink;}
voidSetText( const OUString& rStr ) SAL_OVERRIDE;
OUStringGetAddress();
@@ -224,7 +224,7 @@ private:
DECL_LINK_TYPED(ListBoxSelectHdl_Impl, SvTreeListBox*, void);
DECL_LINK(EditModifyHdl_Impl, void *);
DECL_LINK_TYPED(ImageButtonHdl_Impl, Button*, void);
-DECL_LINK(SelectionChangedHdl_Impl, AddressMultiLineEdit*);
+DECL_LINK_TYPED(SelectionChangedHdl_Impl, AddressMultiLineEdit&, void);
DECL_LINK(FieldChangeHdl_Impl, void *);
boolHasItem_Impl(sal_Int32 nUserData);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: helpauthoring/Addons.xcu
helpauthoring/Addons.xcu | 80 ++- 1 file changed, 79 insertions(+), 1 deletion(-) New commits: commit 4f3df53943c11c5b6a2333a623435fe8012d58d8 Author: Maxim Monastirsky Date: Sun Sep 20 01:30:02 2015 +0300 helpauthoring: Show menu in the start center (tdf#94331) diff --git a/helpauthoring/Addons.xcu b/helpauthoring/Addons.xcu index 3894e58..4870209 100644 --- a/helpauthoring/Addons.xcu +++ b/helpauthoring/Addons.xcu @@ -26,7 +26,7 @@ Help Authoring - com.sun.star.text.TextDocument,com.sun.star.sdb.OfficeDatabaseDocument,com.sun.star.script.BasicIDE + com.sun.star.text.TextDocument,com.sun.star.frame.StartModule @@ -57,6 +57,9 @@ Paragraph Styles + +com.sun.star.text.TextDocument + @@ -112,6 +115,9 @@ Character Styles + +com.sun.star.text.TextDocument + @@ -153,6 +159,9 @@ Insert Embed (
[Libreoffice-commits] core.git: framework/source
framework/source/uielement/menubarmanager.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit b1326ecbb793a5940719b59a049368e7be45147a
Author: Maxim Monastirsky
Date: Sun Sep 20 01:04:50 2015 +0300
tdf#76197 Make OfficeMenuBar work again in the start center
Regression of 4a7720e18238b926531a7082dbb8bc524889.
The code in MenuBarManager::FillMenuManager merges the
addon menu before .uno:WindowList, which doesn't exist
in the start center since that commit.
As a last resort, let's also check for .uno:HelpMenu
(assuming that it's never placed before the Window menu).
Change-Id: If45eebe4351c40d8ed69daba527844ffc02e8458
diff --git a/framework/source/uielement/menubarmanager.cxx
b/framework/source/uielement/menubarmanager.cxx
index 3a3c512..405fb9d 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1139,7 +1139,8 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const
Reference< XFrame >& rF
{
sal_uInt16 nItemId = pMenu->GetItemId( nPos );
OUString aCommand = pMenu->GetItemCommand( nItemId );
-if ( nItemId == SID_MDIWINDOWLIST || aCommand ==
aSpecialWindowCommand)
+if ( nItemId == SID_MDIWINDOWLIST || aCommand ==
aSpecialWindowCommand ||
+ nItemId == SID_HELPMENU || aCommand == aCmdHelpMenu )
{
// Retrieve addon popup menus and add them to our menu bar
framework::AddonMenuManager::MergeAddonPopupMenus( rFrame,
nPos, static_cast(pMenu), m_xContext );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chained-text-boxes' - 811 commits - accessibility/inc accessibility/source android/source avmedia/source basctl/inc basctl/source basebmp/source basegfx
Rebased ref, commits from common ancestor:
commit 98d911f7a692f52d2487aa6905e3a29975197e8a
Author: Thorsten Behrens
Date: Sun Sep 20 01:42:12 2015 +0200
chained editeng: Convert fprintf to SAL_INFO
Change-Id: I8e0cfedd34d7e0d70a30147a3bbf0f1cd8e6d3cc
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 2298ecc..aef05f5 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -564,18 +564,13 @@ void ImpEditEngine::CheckAutoPageSize()
void ImpEditEngine::CheckPageOverflow()
{
-// FIXME(matteocam)
-/* fprintf( stderr, IsPageOverflow(aPaperSize, aPrevPaperSize)
-? "YES Overflow!\n" : "NO Overflow!\n" ); */
-// setting overflow status
-
-fprintf(stderr, "[CONTROL_STATUS] AutoPageSize is %s", (
aStatus.GetControlWord() & EEControlBits::AUTOPAGESIZE ) ? "ON\n" : "OFF\n" );
+SAL_INFO("editeng.chaining", "[CONTROL_STATUS] AutoPageSize is " << ((
aStatus.GetControlWord() & EEControlBits::AUTOPAGESIZE ) ? "ON" : "OFF") );
sal_uInt32 nBoxHeight = GetMaxAutoPaperSize().Height();
-fprintf(stderr, "[OVERFLOW-CHECK] Current MaxAutoPaperHeight is %d\n",
nBoxHeight);
+SAL_INFO("editeng.chaining", "[OVERFLOW-CHECK] Current MaxAutoPaperHeight
is " << nBoxHeight);
sal_uInt32 nTxtHeight = CalcTextHeight(NULL);
-fprintf(stderr, "[OVERFLOW-CHECK] Current Text Height is %d\n",
nTxtHeight);
+SAL_INFO("editeng.chaining", "[OVERFLOW-CHECK] Current Text Height is " <<
nTxtHeight);
sal_uInt32 nParaCount = GetParaPortions().Count();
sal_uInt32 nFirstLineCount = GetLineCount(0);
@@ -4638,7 +4633,7 @@ void
ImpEditEngine::ImplUpdateOverflowingParaNum(sal_uInt32 nPaperHeight)
if ( nY > nPaperHeight /*nCurTextHeight*/ ) // found first paragraph
overflowing
{
mnOverflowingPara = nPara;
-fprintf(stderr, "[CHAINING] Setting first overflowing #Para#:
%d\n", nPara);
+SAL_INFO("editeng.chaining", "[CHAINING] Setting first overflowing
#Para#: " << nPara);
ImplUpdateOverflowingLineNum( nPaperHeight, nPara, nY-nPH);
return;
}
@@ -4664,13 +4659,13 @@ void
ImpEditEngine::ImplUpdateOverflowingLineNum(sal_uInt32 nPaperHeight,
// Debugging output
if (nLine == 0) {
-fprintf(stderr, "[CHAINING] First line has height %d\n", nLH);
+SAL_INFO("editeng.chaining", "[CHAINING] First line has height "
<< nLH);
}
if ( nY > nPaperHeight ) // found first line overflowing
{
mnOverflowingLine = nLine;
-fprintf(stderr, "[CHAINING] Setting first overflowing -Line- to:
%d\n", nLine);
+SAL_INFO("editeng.chaining", "[CHAINING] Setting first overflowing
-Line- to: " << nLine);
return;
}
}
diff --git a/editeng/source/outliner/outliner.cxx
b/editeng/source/outliner/outliner.cxx
index f0c982f..1f077c2 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -2081,17 +2081,16 @@ NonOverflowingText *Outliner::GetNonOverflowingText()
const
// Defensive check: oveflowing para index beyond actual # of paragraphs?
if ( nCount > GetParagraphCount()-1) {
-fprintf(stderr,
-"[Overflowing] Ops, trying to retrieve para %d when max index
is %d\n",
-nCount,
-GetParagraphCount()-1);
+SAL_INFO("editeng.chaining",
+ "[Overflowing] Ops, trying to retrieve para "
+ << nCount << " when max index is " << GetParagraphCount()-1 );
return NULL;
}
if (nCount < 0)
{
-fprintf(stderr,
-"[Overflowing] No Overflowing text but GetNonOverflowinText
called?!\n");
+SAL_INFO("editeng.chaining",
+ "[Overflowing] No Overflowing text but GetNonOverflowinText
called?!");
return NULL;
}
@@ -2189,10 +2188,10 @@ OverflowingText *Outliner::GetOverflowingText() const
// Defensive check: oveflowing para index beyond actual # of paragraphs?
if ( pEditEngine->GetOverflowingParaNum() > GetParagraphCount()-1) {
-fprintf(stderr,
-"[Overflowing] Ops, trying to retrieve para %d when max index
is %d\n",
-pEditEngine->GetOverflowingParaNum(),
-GetParagraphCount()-1);
+SAL_INFO("editeng.chaining",
+ "[Overflowing] Ops, trying to retrieve para "
+ << pEditEngine->GetOverflowingParaNum() << " when max index
is "
+ << GetParagraphCount()-1 );
return NULL;
}
diff --git a/editeng/source/outliner/overflowingtxt.cxx
b/editeng/source/outliner/overflowingtxt.cxx
index 60120e5..0993e37 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -19,7 +19,6 @@
#include "rtl/ustring.hxx"
#inc
[Libreoffice-commits] core.git: Branch 'feature/chained-text-boxes' - editeng/source svx/source
Rebased ref, commits from common ancestor:
commit a99fa0a3c9a4833f7b30d1b4eaa2ac7fc7246cf6
Author: Thorsten Behrens
Date: Sun Sep 20 01:42:12 2015 +0200
chained editeng: Convert fprintf to SAL_INFO
Change-Id: I8e0cfedd34d7e0d70a30147a3bbf0f1cd8e6d3cc
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 70072a2..74eb16d 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -564,18 +564,13 @@ void ImpEditEngine::CheckAutoPageSize()
void ImpEditEngine::CheckPageOverflow()
{
-// FIXME(matteocam)
-/* fprintf( stderr, IsPageOverflow(aPaperSize, aPrevPaperSize)
-? "YES Overflow!\n" : "NO Overflow!\n" ); */
-// setting overflow status
-
-fprintf(stderr, "[CONTROL_STATUS] AutoPageSize is %s", (
aStatus.GetControlWord() & EEControlBits::AUTOPAGESIZE ) ? "ON\n" : "OFF\n" );
+SAL_INFO("editeng.chaining", "[CONTROL_STATUS] AutoPageSize is " << ((
aStatus.GetControlWord() & EEControlBits::AUTOPAGESIZE ) ? "ON" : "OFF") );
sal_uInt32 nBoxHeight = GetMaxAutoPaperSize().Height();
-fprintf(stderr, "[OVERFLOW-CHECK] Current MaxAutoPaperHeight is %d\n",
nBoxHeight);
+SAL_INFO("editeng.chaining", "[OVERFLOW-CHECK] Current MaxAutoPaperHeight
is " << nBoxHeight);
sal_uInt32 nTxtHeight = CalcTextHeight(NULL);
-fprintf(stderr, "[OVERFLOW-CHECK] Current Text Height is %d\n",
nTxtHeight);
+SAL_INFO("editeng.chaining", "[OVERFLOW-CHECK] Current Text Height is " <<
nTxtHeight);
sal_uInt32 nParaCount = GetParaPortions().Count();
sal_uInt32 nFirstLineCount = GetLineCount(0);
@@ -4636,7 +4631,7 @@ void
ImpEditEngine::ImplUpdateOverflowingParaNum(sal_uInt32 nPaperHeight)
if ( nY > nPaperHeight /*nCurTextHeight*/ ) // found first paragraph
overflowing
{
mnOverflowingPara = nPara;
-fprintf(stderr, "[CHAINING] Setting first overflowing #Para#:
%d\n", nPara);
+SAL_INFO("editeng.chaining", "[CHAINING] Setting first overflowing
#Para#: " << nPara);
ImplUpdateOverflowingLineNum( nPaperHeight, nPara, nY-nPH);
return;
}
@@ -4662,13 +4657,13 @@ void
ImpEditEngine::ImplUpdateOverflowingLineNum(sal_uInt32 nPaperHeight,
// Debugging output
if (nLine == 0) {
-fprintf(stderr, "[CHAINING] First line has height %d\n", nLH);
+SAL_INFO("editeng.chaining", "[CHAINING] First line has height "
<< nLH);
}
if ( nY > nPaperHeight ) // found first line overflowing
{
mnOverflowingLine = nLine;
-fprintf(stderr, "[CHAINING] Setting first overflowing -Line- to:
%d\n", nLine);
+SAL_INFO("editeng.chaining", "[CHAINING] Setting first overflowing
-Line- to: " << nLine);
return;
}
}
diff --git a/editeng/source/outliner/outliner.cxx
b/editeng/source/outliner/outliner.cxx
index 77bb66a..040bc6e 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -2094,17 +2094,16 @@ NonOverflowingText *Outliner::GetNonOverflowingText()
const
// Defensive check: oveflowing para index beyond actual # of paragraphs?
if ( nCount > GetParagraphCount()-1) {
-fprintf(stderr,
-"[Overflowing] Ops, trying to retrieve para %d when max index
is %d\n",
-nCount,
-GetParagraphCount()-1);
+SAL_INFO("editeng.chaining",
+ "[Overflowing] Ops, trying to retrieve para "
+ << nCount << " when max index is " << GetParagraphCount()-1 );
return NULL;
}
if (nCount < 0)
{
-fprintf(stderr,
-"[Overflowing] No Overflowing text but GetNonOverflowinText
called?!\n");
+SAL_INFO("editeng.chaining",
+ "[Overflowing] No Overflowing text but GetNonOverflowinText
called?!");
return NULL;
}
@@ -2202,10 +2201,10 @@ OverflowingText *Outliner::GetOverflowingText() const
// Defensive check: oveflowing para index beyond actual # of paragraphs?
if ( pEditEngine->GetOverflowingParaNum() > GetParagraphCount()-1) {
-fprintf(stderr,
-"[Overflowing] Ops, trying to retrieve para %d when max index
is %d\n",
-pEditEngine->GetOverflowingParaNum(),
-GetParagraphCount()-1);
+SAL_INFO("editeng.chaining",
+ "[Overflowing] Ops, trying to retrieve para "
+ << pEditEngine->GetOverflowingParaNum() << " when max index
is "
+ << GetParagraphCount()-1 );
return NULL;
}
diff --git a/editeng/source/outliner/overflowingtxt.cxx
b/editeng/source/outliner/overflowingtxt.cxx
index 60120e5..0993e37 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -19,7 +19,6 @@
#include "rtl/ustring.hxx"
#inc
[Libreoffice-commits] core.git: Branch 'feature/chained-text-boxes' - 15 commits - editeng/Library_editeng.mk editeng/source include/editeng include/svx sd/source svx/inc svx/Library_svxcore.mk svx/so
Rebased ref, commits from common ancestor:
commit 50468cb6b08c64b98fc9134c8f4a61495a3e5214
Author: Thorsten Behrens
Date: Sun Sep 20 01:42:12 2015 +0200
chained editeng: Convert fprintf to SAL_INFO
Change-Id: I8e0cfedd34d7e0d70a30147a3bbf0f1cd8e6d3cc
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 70072a2..74eb16d 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -564,18 +564,13 @@ void ImpEditEngine::CheckAutoPageSize()
void ImpEditEngine::CheckPageOverflow()
{
-// FIXME(matteocam)
-/* fprintf( stderr, IsPageOverflow(aPaperSize, aPrevPaperSize)
-? "YES Overflow!\n" : "NO Overflow!\n" ); */
-// setting overflow status
-
-fprintf(stderr, "[CONTROL_STATUS] AutoPageSize is %s", (
aStatus.GetControlWord() & EEControlBits::AUTOPAGESIZE ) ? "ON\n" : "OFF\n" );
+SAL_INFO("editeng.chaining", "[CONTROL_STATUS] AutoPageSize is " << ((
aStatus.GetControlWord() & EEControlBits::AUTOPAGESIZE ) ? "ON" : "OFF") );
sal_uInt32 nBoxHeight = GetMaxAutoPaperSize().Height();
-fprintf(stderr, "[OVERFLOW-CHECK] Current MaxAutoPaperHeight is %d\n",
nBoxHeight);
+SAL_INFO("editeng.chaining", "[OVERFLOW-CHECK] Current MaxAutoPaperHeight
is " << nBoxHeight);
sal_uInt32 nTxtHeight = CalcTextHeight(NULL);
-fprintf(stderr, "[OVERFLOW-CHECK] Current Text Height is %d\n",
nTxtHeight);
+SAL_INFO("editeng.chaining", "[OVERFLOW-CHECK] Current Text Height is " <<
nTxtHeight);
sal_uInt32 nParaCount = GetParaPortions().Count();
sal_uInt32 nFirstLineCount = GetLineCount(0);
@@ -4636,7 +4631,7 @@ void
ImpEditEngine::ImplUpdateOverflowingParaNum(sal_uInt32 nPaperHeight)
if ( nY > nPaperHeight /*nCurTextHeight*/ ) // found first paragraph
overflowing
{
mnOverflowingPara = nPara;
-fprintf(stderr, "[CHAINING] Setting first overflowing #Para#:
%d\n", nPara);
+SAL_INFO("editeng.chaining", "[CHAINING] Setting first overflowing
#Para#: " << nPara);
ImplUpdateOverflowingLineNum( nPaperHeight, nPara, nY-nPH);
return;
}
@@ -4662,13 +4657,13 @@ void
ImpEditEngine::ImplUpdateOverflowingLineNum(sal_uInt32 nPaperHeight,
// Debugging output
if (nLine == 0) {
-fprintf(stderr, "[CHAINING] First line has height %d\n", nLH);
+SAL_INFO("editeng.chaining", "[CHAINING] First line has height "
<< nLH);
}
if ( nY > nPaperHeight ) // found first line overflowing
{
mnOverflowingLine = nLine;
-fprintf(stderr, "[CHAINING] Setting first overflowing -Line- to:
%d\n", nLine);
+SAL_INFO("editeng.chaining", "[CHAINING] Setting first overflowing
-Line- to: " << nLine);
return;
}
}
diff --git a/editeng/source/outliner/outliner.cxx
b/editeng/source/outliner/outliner.cxx
index 77bb66a..040bc6e 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -2094,17 +2094,16 @@ NonOverflowingText *Outliner::GetNonOverflowingText()
const
// Defensive check: oveflowing para index beyond actual # of paragraphs?
if ( nCount > GetParagraphCount()-1) {
-fprintf(stderr,
-"[Overflowing] Ops, trying to retrieve para %d when max index
is %d\n",
-nCount,
-GetParagraphCount()-1);
+SAL_INFO("editeng.chaining",
+ "[Overflowing] Ops, trying to retrieve para "
+ << nCount << " when max index is " << GetParagraphCount()-1 );
return NULL;
}
if (nCount < 0)
{
-fprintf(stderr,
-"[Overflowing] No Overflowing text but GetNonOverflowinText
called?!\n");
+SAL_INFO("editeng.chaining",
+ "[Overflowing] No Overflowing text but GetNonOverflowinText
called?!");
return NULL;
}
@@ -2202,10 +2201,10 @@ OverflowingText *Outliner::GetOverflowingText() const
// Defensive check: oveflowing para index beyond actual # of paragraphs?
if ( pEditEngine->GetOverflowingParaNum() > GetParagraphCount()-1) {
-fprintf(stderr,
-"[Overflowing] Ops, trying to retrieve para %d when max index
is %d\n",
-pEditEngine->GetOverflowingParaNum(),
-GetParagraphCount()-1);
+SAL_INFO("editeng.chaining",
+ "[Overflowing] Ops, trying to retrieve para "
+ << pEditEngine->GetOverflowingParaNum() << " when max index
is "
+ << GetParagraphCount()-1 );
return NULL;
}
diff --git a/editeng/source/outliner/overflowingtxt.cxx
b/editeng/source/outliner/overflowingtxt.cxx
index 60120e5..f48f519 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -158,11 +158,9 @@ bool NonOverflowingText::IsLastP
CppCheck Report Update
A new cppcheck report is available at : http://dev-builds.libreoffice.org/cppcheck_reports/master/ Note: The script generating this report was run at : 2015-20-09_02:24:19 with user buildslave at host vm140 as /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w /home/buildslave/tmp/www It can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=cppcheck/cppcheck-report.sh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/chained-text-boxes' - 15 commits - editeng/Library_editeng.mk editeng/source include/editeng include/svx sd/source svx/inc svx/Library_svxcore.mk svx/so
Rebased ref, commits from common ancestor:
commit 133498a53c9b639c29eb7c2f90dec6feb8dd476e
Author: Thorsten Behrens
Date: Sun Sep 20 01:42:12 2015 +0200
chained editeng: Convert fprintf to SAL_INFO
Change-Id: I8e0cfedd34d7e0d70a30147a3bbf0f1cd8e6d3cc
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 70072a2..74eb16d 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -564,18 +564,13 @@ void ImpEditEngine::CheckAutoPageSize()
void ImpEditEngine::CheckPageOverflow()
{
-// FIXME(matteocam)
-/* fprintf( stderr, IsPageOverflow(aPaperSize, aPrevPaperSize)
-? "YES Overflow!\n" : "NO Overflow!\n" ); */
-// setting overflow status
-
-fprintf(stderr, "[CONTROL_STATUS] AutoPageSize is %s", (
aStatus.GetControlWord() & EEControlBits::AUTOPAGESIZE ) ? "ON\n" : "OFF\n" );
+SAL_INFO("editeng.chaining", "[CONTROL_STATUS] AutoPageSize is " << ((
aStatus.GetControlWord() & EEControlBits::AUTOPAGESIZE ) ? "ON" : "OFF") );
sal_uInt32 nBoxHeight = GetMaxAutoPaperSize().Height();
-fprintf(stderr, "[OVERFLOW-CHECK] Current MaxAutoPaperHeight is %d\n",
nBoxHeight);
+SAL_INFO("editeng.chaining", "[OVERFLOW-CHECK] Current MaxAutoPaperHeight
is " << nBoxHeight);
sal_uInt32 nTxtHeight = CalcTextHeight(NULL);
-fprintf(stderr, "[OVERFLOW-CHECK] Current Text Height is %d\n",
nTxtHeight);
+SAL_INFO("editeng.chaining", "[OVERFLOW-CHECK] Current Text Height is " <<
nTxtHeight);
sal_uInt32 nParaCount = GetParaPortions().Count();
sal_uInt32 nFirstLineCount = GetLineCount(0);
@@ -4636,7 +4631,7 @@ void
ImpEditEngine::ImplUpdateOverflowingParaNum(sal_uInt32 nPaperHeight)
if ( nY > nPaperHeight /*nCurTextHeight*/ ) // found first paragraph
overflowing
{
mnOverflowingPara = nPara;
-fprintf(stderr, "[CHAINING] Setting first overflowing #Para#:
%d\n", nPara);
+SAL_INFO("editeng.chaining", "[CHAINING] Setting first overflowing
#Para#: " << nPara);
ImplUpdateOverflowingLineNum( nPaperHeight, nPara, nY-nPH);
return;
}
@@ -4662,13 +4657,13 @@ void
ImpEditEngine::ImplUpdateOverflowingLineNum(sal_uInt32 nPaperHeight,
// Debugging output
if (nLine == 0) {
-fprintf(stderr, "[CHAINING] First line has height %d\n", nLH);
+SAL_INFO("editeng.chaining", "[CHAINING] First line has height "
<< nLH);
}
if ( nY > nPaperHeight ) // found first line overflowing
{
mnOverflowingLine = nLine;
-fprintf(stderr, "[CHAINING] Setting first overflowing -Line- to:
%d\n", nLine);
+SAL_INFO("editeng.chaining", "[CHAINING] Setting first overflowing
-Line- to: " << nLine);
return;
}
}
diff --git a/editeng/source/outliner/outliner.cxx
b/editeng/source/outliner/outliner.cxx
index 77bb66a..040bc6e 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -2094,17 +2094,16 @@ NonOverflowingText *Outliner::GetNonOverflowingText()
const
// Defensive check: oveflowing para index beyond actual # of paragraphs?
if ( nCount > GetParagraphCount()-1) {
-fprintf(stderr,
-"[Overflowing] Ops, trying to retrieve para %d when max index
is %d\n",
-nCount,
-GetParagraphCount()-1);
+SAL_INFO("editeng.chaining",
+ "[Overflowing] Ops, trying to retrieve para "
+ << nCount << " when max index is " << GetParagraphCount()-1 );
return NULL;
}
if (nCount < 0)
{
-fprintf(stderr,
-"[Overflowing] No Overflowing text but GetNonOverflowinText
called?!\n");
+SAL_INFO("editeng.chaining",
+ "[Overflowing] No Overflowing text but GetNonOverflowinText
called?!");
return NULL;
}
@@ -2202,10 +2201,10 @@ OverflowingText *Outliner::GetOverflowingText() const
// Defensive check: oveflowing para index beyond actual # of paragraphs?
if ( pEditEngine->GetOverflowingParaNum() > GetParagraphCount()-1) {
-fprintf(stderr,
-"[Overflowing] Ops, trying to retrieve para %d when max index
is %d\n",
-pEditEngine->GetOverflowingParaNum(),
-GetParagraphCount()-1);
+SAL_INFO("editeng.chaining",
+ "[Overflowing] Ops, trying to retrieve para "
+ << pEditEngine->GetOverflowingParaNum() << " when max index
is "
+ << GetParagraphCount()-1 );
return NULL;
}
diff --git a/editeng/source/outliner/overflowingtxt.cxx
b/editeng/source/outliner/overflowingtxt.cxx
index bd0f59f..fb5abd0 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -158,11 +158,9 @@ bool NonOverflowingText::IsLastP
[Libreoffice-commits] core.git: bin/lo-all-static-libs external/Module_external.mk
bin/lo-all-static-libs |2 -- external/Module_external.mk |2 +- 2 files changed, 1 insertion(+), 3 deletions(-) New commits: commit a7b9d29dd6b166c134666f8a235afbc1f2bd0288 Author: Tor Lillqvist Date: Sat Sep 19 21:06:14 2015 +0300 We don't want libxmlsec on iOS, I think It would require NSS which I just decided to skip. If/when we patch it to support native iOS (and OS X?) crypto APIs, re-consider. Or something. Now the TiledLibreOffice iOS demo app builds again. Change-Id: I2816a49bbdbde5a8f9d3b9fcdfff420bdca05ff8 diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs index effa190..e6052c3 100755 --- a/bin/lo-all-static-libs +++ b/bin/lo-all-static-libs @@ -44,8 +44,6 @@ ANDROID) ;; IOS) oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a" -oslibs="$oslibs $WORKDIR/UnpackedTarball/xmlsec/src/.libs/*.a" -oslibs="$oslibs $WORKDIR/UnpackedTarball/xmlsec/src/nss/.libs/*.a" ;; *) oslibs= diff --git a/external/Module_external.mk b/external/Module_external.mk index 51900d5..a5dcade 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -19,7 +19,7 @@ endif $(eval $(call gb_Module_add_moduledirs,external,\ accessories \ - libxmlsec \ + $(if $(filter-out IOS,$(OS)),libxmlsec) \ $(call gb_Helper_optional,ABW,libabw) \ $(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \ $(call gb_Helper_optional,APR,apr) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANN] LibreOffice 5.0.2 RC2 available
Dear Community, The Document Foundation is pleased to announce the second release candidate of LibreOffice 5.0.2. The upcoming 5.0.0 will be the second bugfix release of our fresh 5.0 line. Please be aware that LibreOffice 5.0.2 RC2 has not been flagged as ready for production use yet, however feel free to give it a try instead of 5.0.0. A work-in-progress list of new features in LibreOffice 5.0 can be found at https://wiki.documentfoundation.org/ReleaseNotes/5.0 The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Windows builds are also provided in 64bit version. Should you find bugs, please report them to our Bugzilla: https://bugs.documentfoundation.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/community/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/LibreOffice_Localization_Guide or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs compared to 5.0.2 rc1 is available from our wiki: http://wiki.documentfoundation.org/Releases/5.0.2/RC2 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. On behalf of the Community, Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [ANN] Bugzilla upgraded to 4.4.10
> On Sat, Sep 19, 2015 at 09:30:55AM -0700, julien2412 wrote: >> I'm not sure and, perhaps it's not related, but it seems docx attachments >> have mimetype "application/zip" instead of >> "application/vnd.openxmlformats-officedocument.wordprocessingml.document" >> (eg: https://bugs.documentfoundation.org/show_bug.cgi?id=94359). Even if >> confirmed, not a blocker of course ! :-) Because OOXML and ODF both use ZIP as a container for a bunch of XML, I wonder if the type-detecting mechanisms aren't sufficiently nuanced to detect and differentiate between ZIP and ZIP+(DOCX guts). Here's a quick test using the 'file' command (v5.14) qubit@loopbackoffice:~/libreoffice/bugs$ find -type f -print0 | xargs -0 file ./90736/TableCellBorderLineStyle.pptx: Microsoft PowerPoint 2007+ ./93865/fubar.odt: OpenDocument Text ./93853/checkbox bug_pdf-test-export.pdf: PDF document, version 1.4 ./93853/.~lock.checkbox bug.odt#: ASCII text, with no line terminators ./93853/checkbox bug.odt: OpenDocument Text ./93356/testsort.ods: OpenDocument Spreadsheet ./92703/Character.Controls.rtf:Rich Text Format data, version 1, ANSI ./91293/impress-file-saved-as-pptx.pptx: Zip archive data, at least v2.0 to extract ./91293/.~lock.impress-file-saved-as-pptx_try-2.pptx#: ASCII text, with no line terminators ./91293/impress-file-saved-as-pptx_try-2.pptx: Zip archive data, at least v2.0 to extract ./93868/Lecture 1 African Historical Background.pptx: Microsoft PowerPoint 2007+ ./93851/Untitled 1.ods:OpenDocument Spreadsheet Looks like ODF files are recognized quite well on this system, but it's struggling with OOXML. Is there a correlation between authoring software and recognition? On Sat, Sep 19, 2015 at 1:27 PM, David Tardon wrote: > That's nothing new. The attachment format auto-detection has never really > worked. We did have much worse file-type detection when we were hosted at FDO, but I believe that things have gotten significantly better. David: Is there something we could do to help upstream utilities more easily recognize OOXML files? (both files that LibreOffice creates, as well as ones from other sources) Thanks, --R -- Robinson Tryon QA Engineer - The Document Foundation LibreOffice Community Outreach Herald qu...@libreoffice.org 802-379-9482 | IRC: colonelqubit on Freenode ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/lov-5.0' - 280 commits - avmedia/source basic/source bridges/source canvas/Library_canvasfactory.mk canvas/source configure.ac connectivity/sou
avmedia/source/opengl/oglplayer.cxx| 20 avmedia/source/opengl/oglplayer.hxx|2 avmedia/source/opengl/oglwindow.cxx| 10 avmedia/source/opengl/oglwindow.hxx|4 basic/source/classes/image.cxx | 171 basic/source/classes/sbxmod.cxx|5 basic/source/inc/filefmt.hxx | 30 basic/source/uno/scriptcont.cxx|5 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx| 12 canvas/Library_canvasfactory.mk|1 canvas/source/cairo/cairo_canvas.cxx |4 canvas/source/directx/dx_canvas.cxx|4 canvas/source/factory/cf_service.cxx |5 canvas/source/opengl/ogl_spritedevicehelper.cxx| 35 canvas/source/opengl/ogl_spritedevicehelper.hxx|2 configure.ac | 21 connectivity/source/drivers/mork/MConnection.cxx |8 cppcanvas/source/mtfrenderer/emfplus.cxx | 33 cui/Library_cui.mk |1 cui/source/dialogs/about.cxx |6 cui/source/options/optgdlg.cxx |6 cui/source/options/optjava.cxx | 10 editeng/source/editeng/editattr.cxx|6 editeng/source/editeng/eerdll.cxx |5 editeng/source/editeng/impedit4.cxx|3 editeng/source/items/textitem.cxx | 38 external/boost/UnpackedTarball_boost.mk|3 external/boost/boost.system.error_code_header_only_fix.patch.1 | 21 external/hunspell/UnpackedTarball_hunspell.mk |1 external/hunspell/hunspell-1.3.3-rhbz1261421.patch | 191 external/libebook/ExternalProject_libebook.mk |3 external/libmspub/ExternalProject_libmspub.mk |3 external/liborcus/ExternalProject_liborcus.mk |2 external/libpagemaker/ExternalProject_libpagemaker.mk |3 external/librevenge/ExternalProject_librevenge.mk |3 extras/source/autocorr/emoji/emoji.ulf | 24 extras/source/autocorr/lang/ca/DocumentList.xml| 25 extras/source/autocorr/lang/da/DocumentList.xml| 105 extras/source/autocorr/lang/es/DocumentList.xml| 31 extras/source/autocorr/lang/nl/DocumentList.xml|3 extras/source/autocorr/lang/pl/DocumentList.xml| 1140 +++ extras/source/autocorr/lang/pt/DocumentList.xml|5 extras/source/autocorr/lang/sv/DocumentList.xml| 39 extras/source/autocorr/lang/zh-CN/DocumentList.xml | 137 filter/qa/cppunit/data/met/fail/hang-2.met |binary filter/qa/cppunit/data/pbm/fail/crash-1.pbm|6 filter/qa/cppunit/data/pict/fail/hang-1.pct|binary filter/qa/cppunit/data/psd/pass/hang-1.psd |binary filter/qa/cppunit/data/ras/fail/hang-1.ras |binary filter/qa/cppunit/data/tiff/fail/hang-10.tiff |binary filter/source/flash/swfexporter.cxx| 14 filter/source/flash/swfexporter.hxx|7 filter/source/flash/swfwriter.hxx |3 filter/source/flash/swfwriter1.cxx |2 filter/source/graphicfilter/ios2met/ios2met.cxx| 25 filter/source/graphicfilter/ipbm/ipbm.cxx | 35 filter/source/graphicfilter/ipict/ipict.cxx| 10 filter/source/graphicfilter/ipsd/ipsd.cxx | 19 filter/source/graphicfilter/iras/iras.cxx | 47 filter/source/graphicfilter/itiff/lzwdecom.cxx | 12 filter/source/msfilter/msdffimp.cxx| 60 filter/source/msfilter/svdfppt.cxx | 216 filter/source/svg/svgexport.cxx
[Libreoffice-commits] core.git: Branch 'distro/collabora/lov-5.0' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3f1b620758e4cde98efb723fdac4c56e6cb6e4dc Author: Christian Lohmaier Date: Thu Sep 17 14:16:14 2015 +0200 Updated core Project: translations 4dab7ebff46a1fc46552a21cff65ae4984a31310 update translations for 5.0.2 rc2 and force-fix errors using pocheck Change-Id: I75c2c6b364f384a88b94961160609ba4206bb63d diff --git a/translations b/translations index ee62796..4dab7eb 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit ee62796699c03b6d31184697010db569f6dae8de +Subproject commit 4dab7ebff46a1fc46552a21cff65ae4984a31310 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'distro/collabora/lov-5.0' - 2 commits - cs_CZ/description.xml cs_CZ/dictionaries.xcu cs_CZ/README_cs.txt cs_CZ/README_en.txt cs_CZ/th_cs_CZ_v3.dat Dicti
Dictionary_cs.mk |4 cs_CZ/README_cs.txt| 10 cs_CZ/README_en.txt| 10 cs_CZ/description.xml |4 cs_CZ/dictionaries.xcu | 11 cs_CZ/th_cs_CZ_v3.dat |62748 - 6 files changed, 2 insertions(+), 62785 deletions(-) New commits: commit 2fc00b684de2ccd851a90e85538e995efe6a6965 Author: Robinson Tryon Date: Thu Sep 3 12:32:45 2015 -0500 Branch libreoffice-5-0-2 This is 'libreoffice-5-0-2' - the stable branch for the 5.0.2 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.0.x release, please use the 'libreoffice-5-0' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ia44e4744de5ae0d67a5c659efbb8a09832c22bf8 commit 71f54e95a0b443c673f924c71e23d04b540cc441 Author: Christian Lohmaier Date: Tue Sep 1 09:48:07 2015 +0200 tdf#93514 remove Czech thesaurus Change-Id: I40ebd1ca223fe7950ed3280c43a51a3dfbd0070e (cherry picked from commit 03a4a7b13f28c2c8df08cf6d5049fde97d6b4244) diff --git a/Dictionary_cs.mk b/Dictionary_cs.mk index cc6f4fd..d1c7844 100644 --- a/Dictionary_cs.mk +++ b/Dictionary_cs.mk @@ -17,8 +17,4 @@ $(eval $(call gb_Dictionary_add_root_files,dict-cs,\ dictionaries/cs_CZ/README_en.txt \ )) -$(eval $(call gb_Dictionary_add_thesauri,dict-cs,\ - dictionaries/cs_CZ/th_cs_CZ_v3.dat \ -)) - # vim: set noet sw=4 ts=4: diff --git a/cs_CZ/README_cs.txt b/cs_CZ/README_cs.txt index 473f494..ad6e117 100644 --- a/cs_CZ/README_cs.txt +++ b/cs_CZ/README_cs.txt @@ -12,16 +12,6 @@ Jsou v nem provedeny drobne zmeny nutne pro kompatibilitu s OpenOffice.org. Slovnik je licencovan pod GNU/GPL licenci, ktera je prilozena nize. -SlovnÃk synonym - -Copyright (c) 1994,2008 Karel Pala, Jan VÅ¡ianský -p...@fi.muni.cz - -SlovnÃk můžete volnÄ využÃvat v kanceláÅském balÃku OpenOffice.org (a odvozených). -NesmÃte jej upravovat nebo využÃvat pro komerÄnà úÄely bez souhlasu autora. - - SlovnÃk pro dÄlenà slov --- diff --git a/cs_CZ/README_en.txt b/cs_CZ/README_en.txt index 9cc5e7c..99c02fd 100644 --- a/cs_CZ/README_en.txt +++ b/cs_CZ/README_en.txt @@ -8,16 +8,6 @@ This dictionary for spell-checking Czech texts is licensed under GPL license. The dictionary is based on Czech ispell dictionary created by Petr Kolar and numerous contributors. -Thesaurus --- - -Copyright (c) 1994,2008 Karel Pala, Jan VÅ¡ianský -p...@fi.muni.cz - -You can freely use the thesaurus in OpenOffice.org (or its derivatives). -You can not modify it or use for commercial purposes without the author's -approval. - Hyphenation dictionary -- diff --git a/cs_CZ/description.xml b/cs_CZ/description.xml index 7284b55..0661918 100644 --- a/cs_CZ/description.xml +++ b/cs_CZ/description.xml @@ -31,8 +31,8 @@ The default entry is the one listed first. --> -Czech spell check dictionary, hyphenation rules and thesaurus -Äeský slovnÃk pro kontrolu pravopisu, dÄlenà slov a slovnÃk synonym +Czech spell check dictionary and hyphenation rules +Äeský slovnÃk pro kontrolu pravopisu a dÄlenà slov diff --git a/cs_CZ/dictionaries.xcu b/cs_CZ/dictionaries.xcu index 0a54ce6..95dbb43 100644 --- a/cs_CZ/dictionaries.xcu +++ b/cs_CZ/dictionaries.xcu @@ -25,17 +25,6 @@ cs-CZ - - -%origin%/th_cs_CZ_v3.dat %origin%/th_cs_CZ_v3.idx - - -DICT_THES - - -cs-CZ - - diff --git a/cs_CZ/th_cs_CZ_v3.dat b/cs_CZ/th_cs_CZ_v3.dat deleted file mode 100644 index c67a0b9..000 --- a/cs_CZ/th_cs_CZ_v3.dat +++ /dev/null @@ -1,62748 +0,0 @@ -UTF-8 -zhudlaÅit|1 -(1)|zkazit |zpackat -vrch|4 -(1)|kopec|pahorek|vrÅ¡ek|vyvýšenina -(2)|pahorkatina|vrchovina -(3)|vrchol -(4)|povrch|hoÅejÅ¡ek -Å¡korpit se|1 -(1)|haÅ¡teÅit se|hádat se|Å¡kádlit se -spurtovat|2 -(1)|zrychlit bÄh -(2)|finiÅ¡ovat -oplést|1 -(1)|ovinout |omotat|obtoÄit -báze|2 -(1)|základ|základna|podklad|východisko -(2)|zásada|alkálie -žehnat se|1 -(1)|louÄit se |rozžehnávat se -zahnat|3 -(1)|odehnat |zapudit|zaplaÅ¡it -(2)|ukojit (hlad)|utiÅ¡it|zažehnat -(3)|odnést (bouÅe) -rozohÅovat se|1 -(1)|rozvášÅovat se|rozpalovat se|uklidÅovat se -pÅipamatovat|1 -(1)|pÅipomenout|vzpomenout|upamatovat|zapomenout -propÃt|1 -(1)|utratit (pitÃm)|prohýÅit|prochlastat -dopustit se|1 -(1)|spáchat (zloÄin)|provést -klepnout|4 -(1)|Å¥uknout|kliknout (tlaÄÃtkem)|cvaknout -(2)|zasáhnout |praÅ¡tit -(3)|zabÃt|ranit (mrtvice) -(4)|popovÃdat si|poklepat si|zdrbnout si -zotroÄený|2 -(1)|utlaÄený|porobený -(2)|nesvobodný -zkrotit|1 -(1)|uklidnit |u
[Libreoffice-commits] core.git: Branch 'distro/collabora/lov-5.0' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1cffc81e117e00f0b1e9518ac5305cdb06237660 Author: Robinson Tryon Date: Thu Sep 3 12:32:45 2015 -0500 Updated core Project: dictionaries 2fc00b684de2ccd851a90e85538e995efe6a6965 Branch libreoffice-5-0-2 This is 'libreoffice-5-0-2' - the stable branch for the 5.0.2 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.0.x release, please use the 'libreoffice-5-0' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ia44e4744de5ae0d67a5c659efbb8a09832c22bf8 diff --git a/dictionaries b/dictionaries index bf7a337..2fc00b6 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit bf7a33714170fc040fcfa0b0f0770cf217e5b79c +Subproject commit 2fc00b684de2ccd851a90e85538e995efe6a6965 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [ANN] Bugzilla upgraded to 4.4.10
Hi, On Sat, Sep 19, 2015 at 09:30:55AM -0700, julien2412 wrote: > Hi, > > I'm not sure and, perhaps it's not related, but it seems docx attachments > have mimetype "application/zip" instead of > "application/vnd.openxmlformats-officedocument.wordprocessingml.document" > (eg: https://bugs.documentfoundation.org/show_bug.cgi?id=94359). Even if > confirmed, not a blocker of course ! :-) That's nothing new. The attachment format auto-detection has never really worked. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - bin/lo-all-static-libs ios/experimental
bin/lo-all-static-libs | 12 -- ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 2 - 2 files changed, 1 insertion(+), 13 deletions(-) New commits: commit 6ac7b46651fbb7aae9a7d8db32a3e1f07087b3ee Author: Tor Lillqvist Date: Sat Sep 19 20:56:24 2015 +0300 If we don't want any NSS crack on iOS then don't try to use libs from there Change-Id: I9265ee3ce46d8d2e5af4759e8d9748bd39a3e665 diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs index 8cef486..effa190 100755 --- a/bin/lo-all-static-libs +++ b/bin/lo-all-static-libs @@ -46,17 +46,6 @@ IOS) oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a" oslibs="$oslibs $WORKDIR/UnpackedTarball/xmlsec/src/.libs/*.a" oslibs="$oslibs $WORKDIR/UnpackedTarball/xmlsec/src/nss/.libs/*.a" - -# The NSS dylibs (which we don't build for iOS) are constructed -# from a bunch of static archives and some freestanding object -# files (that are not present in any of the static archives). We -# need the latter too, so collect them here into an archive of -# their own. -ar cr $WORKDIR/UnpackedTarball/nss/nss/lib/ckfw/builtins/out/libLOtemp.a \ -$WORKDIR/UnpackedTarball/nss/nss/lib/ckfw/builtins/out/*.o \ -$WORKDIR/UnpackedTarball/nss/nss/lib/freebl/out/Darwin_SINGLE_SHLIB/*.o - -nsslibs=`find $WORKDIR/UnpackedTarball/nss -name 'lib*.a'` ;; *) oslibs= @@ -67,7 +56,6 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \ $foolibs \ $WORKDIR/LinkTarget/StaticLibrary/lib*.a \ $oslibs \ - $nsslibs \ $WORKDIR/UnpackedTarball/coinmp/Cbc/src/.libs/*.a \ $WORKDIR/UnpackedTarball/coinmp/Cgl/src/.libs/*.a \ $WORKDIR/UnpackedTarball/coinmp/Clp/src/.libs/*.a \ commit dea5a217f04159afca33e27b3ac5e6d6c4f550a0 Author: Tor Lillqvist Date: Sat Sep 19 20:36:26 2015 +0300 We can surely bump IPHONEOS_DEPLOYMENT_TARGET to 8.4 Change-Id: I12d2e44e6e4fe0610e4b64e6c7b047461119cae5 diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj index 55828d5..78b4205 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj @@ -2430,7 +2430,7 @@ "$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive", "$(LO_WORKDIR)/UnpackedTarball/icu/source/common", ); - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.4; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "$(LINK_LDFLAGS)"; SDKROOT = iphoneos; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [ANN] Bugzilla upgraded to 4.4.10
Hi, I'm not sure and, perhaps it's not related, but it seems docx attachments have mimetype "application/zip" instead of "application/vnd.openxmlformats-officedocument.wordprocessingml.document" (eg: https://bugs.documentfoundation.org/show_bug.cgi?id=94359). Even if confirmed, not a blocker of course ! :-) Julien -- View this message in context: http://nabble.documentfoundation.org/ANN-Bugzilla-upgraded-to-4-4-10-tp4160166p4160758.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
[Libreoffice-commits] core.git: 4 commits - configure.ac solenv/bin vcl/Library_vcl.mk xmlsecurity/Module_xmlsecurity.mk
configure.ac |4 +++-
solenv/bin/native-code.py |2 +-
vcl/Library_vcl.mk|2 +-
xmlsecurity/Module_xmlsecurity.mk |2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 1a82f413ce983e6a47744881b1543d7870d8362a
Author: Tor Lillqvist
Date: Sat Sep 19 19:14:24 2015 +0300
I don't think we want to use NSS on iOS either
Change-Id: I3366e9e33e639534c09ddab2f092ef8e9e3b25e5
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index faa8f43..b5c0499 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -61,7 +61,7 @@ $(eval $(call gb_Library_use_externals,vcl,\
$(if $(filter LINUX MACOSX,$(OS)), \
curl) \
jpeg \
- $(if $(filter-out WNT,$(OS)), \
+ $(if $(filter-out IOS WNT,$(OS)), \
nss3 \
plc4) \
libeot \
commit 9c1d7724ada6124c3ba839bd4cb5c6463001f689
Author: Tor Lillqvist
Date: Sat Sep 19 19:12:51 2015 +0300
We hardly want xsec stuff for iOS if not for Android either
Change-Id: I483e2ac92b1fcd7176dd71534cf1c2623ce5a651
diff --git a/xmlsecurity/Module_xmlsecurity.mk
b/xmlsecurity/Module_xmlsecurity.mk
index 596ccad..b4f2646 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,xmlsecurity))
$(eval $(call gb_Module_add_targets,xmlsecurity,\
Library_xmlsecurity \
Library_xsec_fw \
- $(if $(filter-out ANDROID,$(OS)),Library_xsec_xmlsec) \
+ $(if $(filter-out ANDROID IOS,$(OS)),Library_xsec_xmlsec) \
))
$(eval $(call gb_Module_add_l10n_targets,xmlsecurity,\
commit ffaab97ac9a20476185d238b399c7ad093231af3
Author: Tor Lillqvist
Date: Sat Sep 19 18:29:59 2015 +0300
We hardly want xsec stuff for iOS if not for Android either
Change-Id: Ic6485b060eceb47dc96ee102733f308d71beedb8
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 44b1515..24cb818 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -52,7 +52,7 @@ core_factory_list = [
("libxmlsecurity.a", "xmlsecurity_component_getFactory"),
("libxoflo.a", "xof_component_getFactory"),
("libxolo.a", "xo_component_getFactory"),
-("libxsec_xmlsec.a", "xsec_xmlsec_component_getFactory", "#ifndef
ANDROID"),
+("libxsec_xmlsec.a", "xsec_xmlsec_component_getFactory", "#if !defined
ANDROID && !defined IOS"),
("libxstor.a", "xstor_component_getFactory"),
("libvclcanvaslo.a", "vclcanvas_component_getFactory"),
("libmtfrendererlo.a", "mtfrenderer_component_getFactory"),
commit 05b8724bda3b467840c5346be50e4ee0275f385c
Author: Tor Lillqvist
Date: Sat Sep 19 18:29:17 2015 +0300
We indeed don't want to build NSS for iOS, I think
Change-Id: I4917c0158c09b0f5e0a90c373e7e85c734b81366
diff --git a/configure.ac b/configure.ac
index 4259a89..d58df0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8851,7 +8851,9 @@ AC_SUBST(TLS)
dnl ===
dnl Check for system NSS
dnl ===
-libo_CHECK_SYSTEM_MODULE([nss],[NSS],[nss >= 3.9.3 nspr >= 4.8])
+if test $_os != iOS; then
+libo_CHECK_SYSTEM_MODULE([nss],[NSS],[nss >= 3.9.3 nspr >= 4.8])
+fi
if test "$with_system_nss" = "yes"; then
libo_MINGW_CHECK_DLL([libnspr4])
libo_MINGW_CHECK_DLL([libplc4])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: scripts/bugcommenters-by-target.py
scripts/bugcommenters-by-target.py |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c873958d6c5af72c6dc7483da1bb2f17236cf31d
Author: Christian Lohmaier
Date: Sat Sep 19 18:04:55 2015 +0200
bugs.libreoffice.org â bugs.documentfoundation.org
diff --git a/scripts/bugcommenters-by-target.py
b/scripts/bugcommenters-by-target.py
index 9998072..9b11ff9 100755
--- a/scripts/bugcommenters-by-target.py
+++ b/scripts/bugcommenters-by-target.py
@@ -14,7 +14,7 @@ from urllib.request import urlopen, URLError
from io import BytesIO
def get_bugs_for_target(target):
-url =
'https://bugs.libreoffice.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&bug_status=NEEDINFO&bug_status=PLEASETEST&columnlist=&list_id=351988&product=LibreOffice&query_format=advanced&resolution=FIXED&status_whiteboard=target%%3A%s&status_whiteboard_type=allwords&ctype=csv'
% target
+url =
'https://bugs.documentfoundation.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&bug_status=NEEDINFO&bug_status=PLEASETEST&columnlist=&list_id=351988&product=LibreOffice&query_format=advanced&resolution=FIXED&status_whiteboard=target%%3A%s&status_whiteboard_type=allwords&ctype=csv'
% target
try:
resp = urlopen(url)
except URLError:
@@ -28,7 +28,7 @@ def get_bugs_for_target(target):
def get_bug_xml(bug_id):
xml=''
try:
-url = 'https://bugs.libreoffice.org/show_bug.cgi?ctype=xml&id=%d' %
bug_id
+url =
'https://bugs.documentfoundation.org/show_bug.cgi?ctype=xml&id=%d' % bug_id
resp = urlopen(url)
except URLError:
sys.stderr.write('Error fetching {}'.format(url))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/web/WWD_Events.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e72a4a3c2e1608e301daef0b6e87cc70d814e736 Author: Julien Nabet Date: Sat Sep 19 14:51:24 2015 +0200 tdf#92934: Web Wizard: Cannot Export Zip archive pubAware_ adds 2 elements for each of these: LOCAL_PUBLISHER, ZIP_PUBLISHER, FTP_PUBLISHER and since ZIP_PUBLISHER is added in second positon, the right index is 2 not 4 Change-Id: I0a533fd0cefcbbfca0e95628f64fac6258019600 Reviewed-on: https://gerrit.libreoffice.org/18715 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/wizards/com/sun/star/wizards/web/WWD_Events.py b/wizards/com/sun/star/wizards/web/WWD_Events.py index eaca38d..c5dc75e 100644 --- a/wizards/com/sun/star/wizards/web/WWD_Events.py +++ b/wizards/com/sun/star/wizards/web/WWD_Events.py @@ -459,7 +459,7 @@ class WWD_Events(WWD_Startup): zipFile = sd.callStoreDialog( self.settings.cp_DefaultSession.cp_OutDirectory, self.resources.resDefaultArchiveFilename) -self.setPublishUrl(ZIP_PUBLISHER, zipFile, 4) +self.setPublishUrl(ZIP_PUBLISHER, zipFile, 2) self.getPublisher(ZIP_PUBLISHER).overwriteApproved = True ''' ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
FWD: Tromper n’est pas mal, c’est juste la vie
Oui j’aime l’adultère. Je l’aime plus que tout, car il implique à la fois les liens du mariage et des sauteries des plus délicieuses. Le tout avec des personnes qui comme moi sont mariées !!! Je ne me définirait pas comme libérée, j’emmerde les féministes, je suis juste une jouisseuse. -lamaitrese.com- Voilà l’endroit où des femmes post-modernes comme moi sévissent : -lamaitrese.com- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerperfect/source
writerperfect/source/writer/MSWorksImportFilter.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 28fb7c92b4a471a754cb0a567e693eab91726d34 Author: Riccardo Magliocchetti Date: Sat Sep 19 00:25:05 2015 +0200 Remove unused boost include Change-Id: I1cc5d141bb89c574b0f3fd592f21aed82bc46019 Reviewed-on: https://gerrit.libreoffice.org/18710 Tested-by: Jenkins Reviewed-by: Riccardo Magliocchetti diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx index 35e4cb6..ff1e49d 100644 --- a/writerperfect/source/writer/MSWorksImportFilter.cxx +++ b/writerperfect/source/writer/MSWorksImportFilter.cxx @@ -9,7 +9,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: drawinglayer/README drawinglayer/source helpcompiler/source winaccessibility/inc
drawinglayer/README |2 +-
drawinglayer/source/processor2d/vclpixelprocessor2d.hxx |4 ++--
helpcompiler/source/HelpIndexer.cxx |4 ++--
helpcompiler/source/HelpLinker.cxx |3 +--
helpcompiler/source/HelpLinker_main.cxx |6 +++---
winaccessibility/inc/AccObjectManagerAgent.hxx |4 ++--
6 files changed, 11 insertions(+), 12 deletions(-)
New commits:
commit f7ef1cbb83fdc6c43fa39fd50a9e12703e4fcf5f
Author: Caolán McNamara
Date: Fri Sep 18 15:37:00 2015 +0100
boost->std
Change-Id: I5079e03f70370ed83a1158b2e278f48642108f08
Reviewed-on: https://gerrit.libreoffice.org/18692
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/drawinglayer/README b/drawinglayer/README
index d950f29..b530ba6 100644
--- a/drawinglayer/README
+++ b/drawinglayer/README
@@ -19,7 +19,7 @@ A stripped down version with extended comments:
VirtualDevice aVirtualDevice;
// Create processor and draw primitives, to get it ready for rendering.
- boost::scoped_ptr
pProcessor2D(
+ std::unique_ptr pProcessor2D(
drawinglayer::processor2d::createPixelProcessor2DFromOutputDevice(...));
if (pProcessor2D)
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
index 3a70dd8..6699934 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
@@ -25,7 +25,7 @@
#include "vclprocessor2d.hxx"
#include
-#include
+#include
// predefines
@@ -53,7 +53,7 @@ namespace drawinglayer
{
private:
struct Impl;
-boost::scoped_ptr m_pImpl;
+std::unique_ptr m_pImpl;
protected:
/* the local processor for BasePrinitive2D-Implementation based
primitives,
diff --git a/helpcompiler/source/HelpIndexer.cxx
b/helpcompiler/source/HelpIndexer.cxx
index 05bc830..63cf85a 100644
--- a/helpcompiler/source/HelpIndexer.cxx
+++ b/helpcompiler/source/HelpIndexer.cxx
@@ -14,8 +14,8 @@
#include
#include
#include
-#include
#include
+#include
#include "LuceneHelper.hxx"
@@ -42,7 +42,7 @@ bool HelpIndexer::indexDocuments()
bool bUseCJK = sLang == "ja" || sLang == "ko" || sLang == "zh";
// Construct the analyzer appropriate for the given language
-boost::scoped_ptr analyzer;
+std::unique_ptr analyzer;
if (bUseCJK)
analyzer.reset(new
lucene::analysis::LanguageBasedAnalyzer(L"cjk"));
else
diff --git a/helpcompiler/source/HelpLinker.cxx
b/helpcompiler/source/HelpLinker.cxx
index a977392..24653b4 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -37,7 +37,6 @@
#include
#include
-#include
IndexerPreProcessor::IndexerPreProcessor
( const std::string& aModuleName, const fs::path& fsIndexBaseDir,
@@ -945,7 +944,7 @@ bool compileExtensionHelp
xmlSetStructuredErrorFunc( NULL, StructuredXMLErrorFunction );
try
{
-boost::scoped_ptr pHelpLinker(new HelpLinker());
+std::unique_ptr pHelpLinker(new HelpLinker());
pHelpLinker->main( args, &aStdStrExtensionPath, &aStdStrDestination,
&aOfficeHelpPath );
}
catch( const HelpProcessingException& e )
diff --git a/helpcompiler/source/HelpLinker_main.cxx
b/helpcompiler/source/HelpLinker_main.cxx
index e4e45fe..36826b4 100644
--- a/helpcompiler/source/HelpLinker_main.cxx
+++ b/helpcompiler/source/HelpLinker_main.cxx
@@ -19,9 +19,9 @@
#include
#include
-#include
#include
-#include
+#include
+#include
SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
std::vector args;
@@ -29,7 +29,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
args.push_back(std::string(argv[i]));
try
{
-boost::scoped_ptr pHelpLinker(new HelpLinker());
+std::unique_ptr pHelpLinker(new HelpLinker());
pHelpLinker->main( args );
}
catch( const HelpProcessingException& e )
diff --git a/winaccessibility/inc/AccObjectManagerAgent.hxx
b/winaccessibility/inc/AccObjectManagerAgent.hxx
index 7e685b7..568d8e4 100644
--- a/winaccessibility/inc/AccObjectManagerAgent.hxx
+++ b/winaccessibility/inc/AccObjectManagerAgent.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCOBJECTMANAGERAGENT_HXX
#define INCLUDED_WINACCESSIBILITY_INC_ACCOBJECTMANAGERAGENT_HXX
-#include
+#include
#include
@@ -37,7 +37,7 @@ class AccObjectManagerAgent
{
private:
-boost::scoped_ptr pWinManager;
+std::unique_ptr pWinManager;
public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/experimental
ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj |
2 ++
1 file changed, 2 insertions(+)
New commits:
commit f626b886d03f882fc72589db846f24df5290bb03
Author: Tor Lillqvist
Date: Sat Sep 19 10:41:27 2015 +0300
We don't want bitcode at least for now
Change-Id: I54c6a9f665957fb8ff67cce96b5718d5afbb
diff --git
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index c5d9a6c2..55828d5 100644
---
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -2444,6 +2444,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME =
LaunchImage;
+ ENABLE_BITCODE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER =
"TiledLibreOffice/TiledLibreOffice-Prefix.pch";
INFOPLIST_FILE =
"TiledLibreOffice/TiledLibreOffice-Info.plist";
@@ -2457,6 +2458,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME =
LaunchImage;
+ ENABLE_BITCODE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER =
"TiledLibreOffice/TiledLibreOffice-Prefix.pch";
INFOPLIST_FILE =
"TiledLibreOffice/TiledLibreOffice-Info.plist";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
