[Libreoffice-commits] core.git: 2 commits - cui/source editeng/source include/editeng sw/source writerfilter/source
cui/source/tabpages/autocdlg.cxx|6 -
editeng/source/misc/acorrcfg.cxx|4 -
editeng/source/misc/swafopt.cxx |4 -
include/editeng/swafopt.hxx |2
sw/source/core/edit/autofmt.cxx | 10 +--
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 76 +++-
6 files changed, 49 insertions(+), 53 deletions(-)
New commits:
commit c642425fd372ef219a683b5198600746fb7f0c3c
Author: Miklos Vajna
Date: Tue May 26 09:07:26 2015 +0200
writerfilter: remove misleading prefix of non-member variables
Change-Id: I8c1883de9acf1d66f4fc5cb994a3cb97103789a6
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index d15d59e..ca94b05 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -547,19 +547,18 @@ void OOXMLDocumentImpl::incrementProgress()
void OOXMLDocumentImpl::resolveCustomXmlStream(Stream & rStream)
{
// Resolving all item[n].xml files from CustomXml folder.
-uno::Reference mxRelationshipAccess;
-
mxRelationshipAccess.set((dynamic_cast(*mpStream.get())).accessDocumentStream(),
uno::UNO_QUERY_THROW);
-if (mxRelationshipAccess.is())
+uno::Reference xRelationshipAccess;
+
xRelationshipAccess.set((dynamic_cast(*mpStream.get())).accessDocumentStream(),
uno::UNO_QUERY_THROW);
+if (xRelationshipAccess.is())
{
static const char sCustomType[] =
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml";;
static const char sCustomTypeStrict[] =
"http://purl.oclc.org/ooxml/officeDocument/relationships/customXml";;
OUString sTarget("Target");
bool bFound = false;
sal_Int32 counter = 0;
-uno::Sequence< uno::Sequence< beans::StringPair > >aSeqs =
-mxRelationshipAccess->getAllRelationships();
-uno::Sequence >
mxCustomXmlDomListTemp(aSeqs.getLength());
-uno::Sequence >
mxCustomXmlDomPropsListTemp(aSeqs.getLength());
+uno::Sequence< uno::Sequence< beans::StringPair > >aSeqs =
xRelationshipAccess->getAllRelationships();
+uno::Sequence >
xCustomXmlDomListTemp(aSeqs.getLength());
+uno::Sequence >
xCustomXmlDomPropsListTemp(aSeqs.getLength());
for (sal_Int32 j = 0; j < aSeqs.getLength(); j++)
{
uno::Sequence< beans::StringPair > aSeq = aSeqs[j];
@@ -585,8 +584,8 @@ void OOXMLDocumentImpl::resolveCustomXmlStream(Stream &
rStream)
// grabbag list.
if(mxCustomXmlProsDom.is() && customXmlTemp.is())
{
-mxCustomXmlDomListTemp[counter] = customXmlTemp;
-mxCustomXmlDomPropsListTemp[counter] = mxCustomXmlProsDom;
+xCustomXmlDomListTemp[counter] = customXmlTemp;
+xCustomXmlDomPropsListTemp[counter] = mxCustomXmlProsDom;
counter++;
resolveFastSubStream(rStream, OOXMLStream::CUSTOMXML);
}
@@ -594,10 +593,10 @@ void OOXMLDocumentImpl::resolveCustomXmlStream(Stream &
rStream)
}
}
-mxCustomXmlDomListTemp.realloc(counter);
-mxCustomXmlDomPropsListTemp.realloc(counter);
-mxCustomXmlDomList = mxCustomXmlDomListTemp;
-mxCustomXmlDomPropsList = mxCustomXmlDomPropsListTemp;
+xCustomXmlDomListTemp.realloc(counter);
+xCustomXmlDomPropsListTemp.realloc(counter);
+mxCustomXmlDomList = xCustomXmlDomListTemp;
+mxCustomXmlDomPropsList = xCustomXmlDomPropsListTemp;
}
}
@@ -623,14 +622,13 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream &
/*rStream*/)
"createStream for glossary" << OOXMLStream::GLOSSARY << " : "
<< e.Message);
return;
}
-uno::Reference mxRelationshipAccess;
-
mxRelationshipAccess.set((dynamic_cast(*pStream.get())).accessDocumentStream(),
uno::UNO_QUERY_THROW);
-if (mxRelationshipAccess.is())
+uno::Reference xRelationshipAccess;
+
xRelationshipAccess.set((dynamic_cast(*pStream.get())).accessDocumentStream(),
uno::UNO_QUERY_THROW);
+if (xRelationshipAccess.is())
{
-uno::Sequence< uno::Sequence< beans::StringPair > >aSeqs =
-mxRelationshipAccess->getAllRelationships();
-uno::Sequence >
mxGlossaryDomListTemp(aSeqs.getLength());
+uno::Sequence< uno::Sequence< beans::StringPair > >aSeqs =
xRelationshipAccess->getAllRelationships();
+uno::Sequence >
xGlossaryDomListTemp(aSeqs.getLength());
sal_Int32 counter = 0;
for (sal_Int32 j = 0; j < aSeqs.getLength(); j++)
{
@@ -700,21 +698,21 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream &
/*rStream*/)
glossaryTuple[2] = uno::makeAny(gType);
glossaryTuple[3] = uno::makeAn
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/CntntIdxStore.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit efc8510ca900153442b329ec318f28cddd826757
Author: Stephan Bergmann
Date: Tue May 26 09:24:57 2015 +0200
loplugin:redundantcast
Change-Id: Id30d771b85716ab9c51e4c8fde36ad397ab44678
diff --git a/sw/source/core/doc/CntntIdxStore.cxx
b/sw/source/core/doc/CntntIdxStore.cxx
index ef7bab4..5b6271e 100644
--- a/sw/source/core/doc/CntntIdxStore.cxx
+++ b/sw/source/core/doc/CntntIdxStore.cxx
@@ -384,7 +384,7 @@ void ContentIdxStoreImpl::SaveUnoCrsrs(SwDoc* pDoc,
sal_uLong nNode, sal_Int32 n
auto pUnoCrsr(pWeakUnoCrsr.lock());
if(!pUnoCrsr)
continue;
-for(SwPaM& rPaM :
(const_cast(pUnoCrsr.get()))->GetRingContainer())
+for(SwPaM& rPaM : pUnoCrsr.get()->GetRingContainer())
{
lcl_ChkPaMBoth( m_aUnoCrsrEntries, nNode, nContent, rPaM);
}
___
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' - 4 commits - editeng/source include/LibreOfficeKit sw/source
editeng/source/editeng/impedit.cxx |4 ++--
editeng/source/editeng/impedit2.cxx |4 ++--
include/LibreOfficeKit/LibreOfficeKitEnums.h | 10 +-
sw/source/core/crsr/findtxt.cxx |7 +--
sw/source/uibase/uiview/view2.cxx|2 ++
5 files changed, 20 insertions(+), 7 deletions(-)
New commits:
commit 3224c2ad9ee16d3d437aa30cff68d6016a25549d
Author: Miklos Vajna
Date: Sat May 23 10:43:41 2015 +0100
SwView::UpdatePageNums: add LOK callback about page count change
Change-Id: If9ab69c9f3ec3f9f518738792ff020ef4cfd6390
(cherry picked from commit fb2e4da0e20fea3c085ddec899376e7f3671e1b1)
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index ffa2f64..54862e1 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -143,7 +143,15 @@ typedef enum
/**
* No match was found for the search input
*/
-LOK_CALLBACK_SEARCH_NOT_FOUND
+LOK_CALLBACK_SEARCH_NOT_FOUND,
+
+/**
+ * Number of pages changed in the document.
+ *
+ * Clients should assume that data returned by an earlier
+ * lok::Document::getDocumentSize() call is no longer valid.
+ */
+LOK_CALLBACK_PAGE_COUNT_CHANGED
}
LibreOfficeKitCallbackType;
diff --git a/sw/source/uibase/uiview/view2.cxx
b/sw/source/uibase/uiview/view2.cxx
index b6f947d..a8ce619 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -147,6 +147,7 @@
#include
#include
+#include
const char sStatusDelim[] = " : ";
const char sStatusComma[] = " , ";
@@ -1280,6 +1281,7 @@ void SwView::Execute(SfxRequest &rReq)
/// invalidate page numbering field
void SwView::UpdatePageNums(sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, const
OUString& rPgStr)
{
+GetWrtShell().libreOfficeKitCallback(LOK_CALLBACK_PAGE_COUNT_CHANGED, 0);
OUString sTemp(GetPageStr( nPhyNum, nVirtNum, rPgStr ));
const SfxStringItem aTmp( FN_STAT_PAGE, sTemp );
// Used to distinguish which tooltip to show
commit 57840bb2030bdd3d4d4fa41dd77ee4069e854486
Author: Miklos Vajna
Date: Wed May 20 16:56:45 2015 +0200
SwPaM::Find: forgot to show the cursor after ending the text edit
Without this, if you searched inside a shape, then got a next hit
outside the shape, you didn't get your blinking cursor even if you
clicked into the writer text.
Change-Id: I053af9672dc9290728b16780f21301b3b840cb55
(cherry picked from commit 1633fb2651e32f3dab5104b11074e7904cdcbec3)
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 9a2a8a1..c15e5d1 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -27,7 +27,7 @@
#include
#include
-#include
+#include
#include
#include
#include
@@ -294,7 +294,7 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool
bSearchInNotes , utl::Te
}
SwDocShell *const pDocShell = pNode->GetDoc()->GetDocShell();
-SwViewShell *const pWrtShell = (pDocShell) ?
pDocShell->GetEditShell() : 0;
+SwWrtShell *const pWrtShell = (pDocShell) ?
pDocShell->GetWrtShell() : 0;
SwPostItMgr *const pPostItMgr = (pWrtShell) ?
pWrtShell->GetPostItMgr() : 0;
SvxSearchItem aSearchItem(SID_SEARCH_ITEM);
@@ -311,7 +311,10 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool
bSearchInNotes , utl::Te
{
// If not found, end the text edit.
pSdrView->SdrEndTextEdit();
+const Point
aPoint(pSdrView->GetAllMarkedRect().TopLeft());
pSdrView->UnmarkAll();
+pWrtShell->SetCursor(&aPoint, true);
+pWrtShell->Edit();
}
else
{
commit b1e1bb2f3c5b32ec8898c006704c3ebacff78bf3
Author: Miklos Vajna
Date: Wed May 20 15:26:27 2015 +0200
ImpEditView::SetCursorAtPoint tiled rendering: avoid partial selections
Same problem as in the previous commit, just for mouse move. Previously
when selecting "abc" with the mouse only one or zero letter got selected
as the mouse moved, now it's properly the whole afffected string.
Change-Id: I025dbd71fc02a0c93a532ca188836ffb957d6b35
(cherry picked from commit c6f03d6fc25a3cea22f2ce035d0948bcaa74daa9)
diff --git a/editeng/source/editeng/impedit.cxx
b/editeng/source/editeng/impedit.cxx
index 676fc44..d1f5d95 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1531,8 +1531,8 @@ bool ImpEditView::SetCursorAtPoint( const Point&
rPointPixel )
EditPaM aPaM = pEditEngine->GetPaM(aDocPos);
bool bGotoCursor = DoAutoScroll();
-// aTmpNewSel: Diff between old and new, not the new selection
-EditSelection aTmpNew
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/token.hxx|9 -
starmath/source/parse.cxx |1 -
2 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 280aa181def7e04ddaedf41eca55c84ee4158b6c
Author: Takeshi Abe
Date: Tue May 26 00:20:20 2015 +0900
kill forgotten, unused TDEBUG token
I remember that, before LibreOffice 4, "MZ23" used to be a magic
string which we could not see in the preview window as if there was
no node.
Change-Id: If80b77e1e24a2c5f8b3528fac8e9209b8c0b5954
Reviewed-on: https://gerrit.libreoffice.org/15893
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx
index ec01bcf..dbc24d5 100644
--- a/starmath/inc/token.hxx
+++ b/starmath/inc/token.hxx
@@ -91,11 +91,10 @@ enum SmTokenType
/*210*/ TDIVIDES, TNDIBVIDES, TSETN, TSETZ, TSETQ,
/*215*/ TSETR, TSETC, TWIDEVEC, TWIDETILDE,
TWIDEHAT,
/*220*/ TWIDESLASH, TWIDEBACKSLASH, TLDBRACKET, TRDBRACKET,
TNOSPACE,
-/*225*/ TUNKNOWN, TDEBUG, TPRECEDES, TSUCCEEDS,
TPRECEDESEQUAL,
-/*230*/ TSUCCEEDSEQUAL, TPRECEDESEQUIV, TSUCCEEDSEQUIV, TNOTPRECEDES,
TNOTSUCCEEDS,
-/*235*/ TSILVER,TGRAY, TMAROON,TPURPLE,TLIME,
-/*240*/ TOLIVE, TNAVY, TTEAL, TAQUA,
TFUCHSIA,
-/*245*/ TINTD
+/*225*/ TUNKNOWN, TPRECEDES, TSUCCEEDS, TPRECEDESEQUAL,
TSUCCEEDSEQUAL,
+/*230*/ TPRECEDESEQUIV, TSUCCEEDSEQUIV, TNOTPRECEDES, TNOTSUCCEEDS,
TSILVER,
+/*235*/ TGRAY, TMAROON,TPURPLE,TLIME, TOLIVE,
+/*240*/ TNAVY, TTEAL, TAQUA, TFUCHSIA, TINTD
};
struct SmToken
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index fb7ac73..d70ca9d 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -60,7 +60,6 @@ SmToken::SmToken(SmTokenType eTokenType,
static const SmTokenTableEntry aTokenTable[] =
{
{ "Im" , TIM, MS_IM, TGSTANDALONE, 5 },
-{ "MZ23", TDEBUG, '\0', TGATTRIBUT, 0 },
{ "Re" , TRE, MS_RE, TGSTANDALONE, 5 },
{ "abs", TABS, '\0', TGUNOPER, 13 },
{ "arcosh", TACOSH, '\0', TGFUNCTION, 5 },
___
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/core/unocore/unotbl.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit b255913e412a7894928f92e29d6445bc412a87db
Author: Stephan Bergmann
Date: Tue May 26 10:12:49 2015 +0200
loplugin:staticcall
Change-Id: I5695a7854d22d10681739dd2eabe41f9802089f5
diff --git a/sw/source/core/unocore/unotbl.cxx
b/sw/source/core/unocore/unotbl.cxx
index c698cd2..cbd5bc6 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -3297,7 +3297,7 @@ void SwXCellRange::setPropertyValue(const OUString&
rPropertyName, const uno::An
case FN_UNO_TABLE_CELL_BACKGROUND:
{
SvxBrushItem aBrush( RES_BACKGROUND );
-pDoc->GetBoxAttr( *m_pTableCrsr, aBrush );
+SwDoc::GetBoxAttr( *m_pTableCrsr, aBrush );
((SfxPoolItem&)aBrush).PutValue(aValue, pEntry->nMemberId);
pDoc->SetBoxAttr( *m_pTableCrsr, aBrush );
@@ -3405,7 +3405,7 @@ uno::Any SwXCellRange::getPropertyValue(const OUString&
rPropertyName)
case FN_UNO_TABLE_CELL_BACKGROUND:
{
SvxBrushItem aBrush( RES_BACKGROUND );
-if(m_pTableCrsr->GetDoc()->GetBoxAttr( *m_pTableCrsr,
aBrush ))
+if(SwDoc::GetBoxAttr( *m_pTableCrsr, aBrush ))
aBrush.QueryValue(aRet, pEntry->nMemberId);
}
@@ -3418,7 +3418,7 @@ uno::Any SwXCellRange::getPropertyValue(const OUString&
rPropertyName)
SID_ATTR_BORDER_INNER,
SID_ATTR_BORDER_INNER,
0);
aSet.Put(SvxBoxInfoItem( SID_ATTR_BORDER_INNER ));
-pDoc->GetTabBorders(*m_pTableCrsr, aSet);
+SwDoc::GetTabBorders(*m_pTableCrsr, aSet);
const SvxBoxItem& rBoxItem = static_cast(aSet.Get(RES_BOX));
rBoxItem.QueryValue(aRet, pEntry->nMemberId);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source
basic/source/inc/runtime.hxx | 20 ++---
basic/source/runtime/methods.cxx | 10
basic/source/runtime/methods1.cxx |2 -
basic/source/runtime/runtime.cxx | 43 ++
4 files changed, 34 insertions(+), 41 deletions(-)
New commits:
commit 6a4a55d5f48e52dd4a5094028d729ac4cc9d766e
Author: Arnaud Versini
Date: Sat May 23 14:32:22 2015 +0200
BASIC: User std::unique_ptr in basic runtime
Change-Id: Iac7efdad78cf2f827cbddbc671dd0d1b5ae1d467
Reviewed-on: https://gerrit.libreoffice.org/15874
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index fc7d093..f2bcba9 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -31,6 +31,7 @@
#include
#include
+#include
#include
#include
#include
@@ -134,11 +135,14 @@ class SbiInstance
SbiRTLData aRTLData;
-SbiIoSystem*pIosys; // file system
-SbiDdeControl* pDdeCtrl; // DDE
-SbiDllMgr* pDllMgr;// DLL-Calls (DECLARE)
+// file system
+std::unique_ptr pIosys;
+// DDE
+std::unique_ptrpDdeCtrl;
+// DLL-Calls (DECLARE)
+std::unique_ptrpDllMgr;
+std::unique_ptr pNumberFormatter;
StarBASIC* pBasic;
-SvNumberFormatter* pNumberFormatter;
LanguageTypemeFormatterLangType;
DateFormat meFormatterDateFormat;
sal_uInt32 nStdDateIdx, nStdTimeIdx, nStdDateTimeIdx;
@@ -185,8 +189,8 @@ public:
SbMethod* GetCaller( sal_uInt16 );
SbModule* GetActiveModule();
-SbiIoSystem* GetIoSystem() { return pIosys; }
-SbiDdeControl* GetDdeControl() { return pDdeCtrl; }
+SbiIoSystem* GetIoSystem() { return pIosys.get(); }
+SbiDdeControl* GetDdeControl() { return pDdeCtrl.get(); }
StarBASIC* GetBasic() { return pBasic; }
SbiDllMgr* GetDllMgr();
SbiRTLData* GetRTLData() const { return
const_cast(&aRTLData); }
@@ -197,8 +201,8 @@ public:
sal_uInt32 GetStdDateTimeIdx() const { return nStdDateTimeIdx; }
// offer NumberFormatter also static
-static void PrepareNumberFormatter( SvNumberFormatter*& rpNumberFormatter,
-sal_uInt32 &rnStdDateIdx, sal_uInt32 &rnStdTimeIdx, sal_uInt32
&rnStdDateTimeIdx,
+static SvNumberFormatter* PrepareNumberFormatter( sal_uInt32 &rnStdDateIdx,
+sal_uInt32 &rnStdTimeIdx, sal_uInt32 &rnStdDateTimeIdx,
LanguageType* peFormatterLangType=NULL, DateFormat*
peFormatterDateFormat=NULL );
};
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index a2bb346..ea1d8c2 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2137,7 +2137,7 @@ RTLFUNC(DateValue)
else
{
sal_uInt32 n; // Dummy
-SbiInstance::PrepareNumberFormatter( pFormatter, n, n, n );
+pFormatter = SbiInstance::PrepareNumberFormatter( n, n, n );
}
sal_uInt32 nIndex = 0;
@@ -2205,7 +2205,7 @@ RTLFUNC(TimeValue)
else
{
sal_uInt32 n;
-SbiInstance::PrepareNumberFormatter( pFormatter, n, n, n );
+pFormatter = SbiInstance::PrepareNumberFormatter( n, n, n );
}
sal_uInt32 nIndex = 0;
@@ -2428,7 +2428,7 @@ RTLFUNC(Time)
else
{
sal_uInt32 n; // Dummy
-SbiInstance::PrepareNumberFormatter( pFormatter, n, nIndex, n
);
+pFormatter = SbiInstance::PrepareNumberFormatter( n, nIndex, n
);
}
pFormatter->GetOutputString( nDays, nIndex, aRes, &pCol );
@@ -2485,7 +2485,7 @@ RTLFUNC(Date)
else
{
sal_uInt32 n;
-SbiInstance::PrepareNumberFormatter( pFormatter, nIndex, n, n
);
+pFormatter = SbiInstance::PrepareNumberFormatter( nIndex, n, n
);
}
pFormatter->GetOutputString( nDays, nIndex, aRes, &pCol );
@@ -3274,7 +3274,7 @@ RTLFUNC(FileDateTime)
else
{
sal_uInt32 n;
-SbiInstance::PrepareNumberFormatter( pFormatter, n, n, nIndex );
+pFormatter = SbiInstance::PrepareNumberFormatter( n, n, nIndex );
}
OUString aRes;
diff --git a/basic/source/runtime/methods1.cxx
b/basic/source/runtime/methods1.cxx
index a1eca5f..66e66d7 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -2542,7 +2542,7 @@ RTLFUNC(FormatDateTime)
else
{
sal_uInt32 n; // Dummy
-SbiInstance::PrepareNumberFormatter( pFormatter, n, n, n );
+pFormatter = SbiInstance::PrepareNumberFormatter( n, n, n );
}
LanguageType eLangType =
Application::GetSettings().GetLanguageTag().getLanguageType();
diff
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 2 commits - svx/source sw/qa writerfilter/source
svx/source/customshapes/EnhancedCustomShapeEngine.cxx |2 +-
sw/qa/extras/rtfimport/data/tdf90315.rtf |4
sw/qa/extras/rtfimport/rtfimport.cxx |9 +
writerfilter/source/dmapper/SectionColumnHandler.cxx |2 +-
4 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 5101c13a3e54256bd79c412484e71d6d0f269187
Author: Miklos Vajna
Date: Sat May 23 19:23:05 2015 +0100
tdf#90315 RTF import: fix \colsx default value
See SectPageInformation::mnColsx on the libreoffice-3-6 branch + the
spec agrees, too.
Change-Id: I6f70a125f8d962621f319e3e75e2865e5f126859
(cherry picked from commit e18adb7369d140f33b947668a69da2fa78738e7b)
diff --git a/sw/qa/extras/rtfimport/data/tdf90315.rtf
b/sw/qa/extras/rtfimport/data/tdf90315.rtf
new file mode 100644
index 000..df99754
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf90315.rtf
@@ -0,0 +1,4 @@
+{\rtf1\cols2
+foo\par
+bar\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index e74d694..86dddfc 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2292,6 +2292,15 @@ DECLARE_RTFIMPORT_TEST(testTdf86814, "tdf86814.rtf")
CPPUNIT_ASSERT_EQUAL(awt::FontWeight::BOLD,
getProperty(getRun(getParagraph(1), 1), "CharWeight"));
}
+DECLARE_RTFIMPORT_TEST(testTdf90315, "tdf90315.rtf")
+{
+uno::Reference
xTextSectionsSupplier(mxComponent, uno::UNO_QUERY);
+uno::Reference
xTextSections(xTextSectionsSupplier->getTextSections(), uno::UNO_QUERY);
+uno::Reference
xTextSection(xTextSections->getByIndex(0), uno::UNO_QUERY);
+// This was 0, but default should be 720 twips.
+CPPUNIT_ASSERT_EQUAL(static_cast(1270),
getProperty(xTextSection->getPropertyValue("TextColumns"),
"AutomaticDistance"));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/SectionColumnHandler.cxx
b/writerfilter/source/dmapper/SectionColumnHandler.cxx
index 3a35754..91dfc91 100644
--- a/writerfilter/source/dmapper/SectionColumnHandler.cxx
+++ b/writerfilter/source/dmapper/SectionColumnHandler.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star;
SectionColumnHandler::SectionColumnHandler()
: LoggedProperties("SectionColumnHandler")
, bEqualWidth(false)
-, nSpace(0)
+, nSpace(1270) // 720 twips
, nNum(0)
, bSep(false)
{
commit 92a9c03e5100952dd364e38366ec0f80999cbc43
Author: Miklos Vajna
Date: Thu May 21 15:12:10 2015 +0100
tdf#91095 svx: avoid unconditional SdrObject -> SdrObjCustomShape
static_cast
Change-Id: I5ed86633e909c13f14ee382b4d9ec8f9c264df1d
(cherry picked from commit 23cba1f55f1937c27c2a1bc27f9d3fd7b1ef1b47)
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 2beb70f..c78641f 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -273,7 +273,7 @@ Reference< drawing::XShape > SAL_CALL
EnhancedCustomShapeEngine::render()
throw ( RuntimeException, std::exception )
{
Reference< drawing::XShape > xShape;
-SdrObject* pSdrObjCustomShape( GetSdrObjectFromXShape( mxShape ) );
+SdrObject* pSdrObjCustomShape( PTR_CAST( SdrObjCustomShape,
GetSdrObjectFromXShape( mxShape ) ) );
if ( pSdrObjCustomShape )
{
// retrieving the TextPath property to check if feature is enabled
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/hyperlink-field.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |8
sw/source/filter/ww8/docxattributeoutput.cxx | 10 +-
3 files changed, 13 insertions(+), 5 deletions(-)
New commits:
commit 064b29e381dc48c5fcad027549159bdaeaa49c80
Author: Caolán McNamara
Date: Mon May 25 11:06:46 2015 +0100
fix assert on export of ooo40760-1.sxw to docx
and a pile more
Change-Id: I7334233c789bb0ed7a60387ef7d84dd34ab5a187
(cherry picked from commit 3185b6c8caf97afa602c864f588d079cbbe04038)
Reviewed-on: https://gerrit.libreoffice.org/15891
Tested-by: David Tardon
Reviewed-by: David Tardon
diff --git a/sw/qa/extras/ooxmlexport/data/hyperlink-field.odt
b/sw/qa/extras/ooxmlexport/data/hyperlink-field.odt
new file mode 100644
index 000..0c265cf
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/hyperlink-field.odt
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 20e3a00..4b1a79e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -230,6 +230,14 @@ DECLARE_OOXMLEXPORT_TEST(testFloatingTable,
"fdo77887.docx")
}
+DECLARE_OOXMLEXPORT_TEST(testHyperlinkContainingPlaceholderField,
"hyperlink-field.odt")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+
+if (!pXmlDoc)
+ return;
+}
+
DECLARE_OOXMLEXPORT_TEST(testTablePreferredWidth, "tablePreferredWidth.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index d6ad76d..171d08c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1040,11 +1040,6 @@ void DocxAttributeOutput::EndRun()
{
StartField_Impl( *pIt );
-if ( m_pHyperlinkAttrList )
-{
-m_nFieldsInHyperlink++;
-}
-
// Remove the field from the stack if only the start has to be
written
// Unknown fields should be removed too
if ( !pIt->bClose || ( pIt->eType == ww::eUNKNOWN ) )
@@ -1054,6 +1049,11 @@ void DocxAttributeOutput::EndRun()
pIt = m_Fields.erase( pIt );
continue;
}
+
+if ( m_pHyperlinkAttrList )
+{
+m_nFieldsInHyperlink++;
+}
}
++pIt;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/deployment/gui/dp_gui_extlistbox.cxx |6 +++---
desktop/source/deployment/manager/dp_manager.cxx |7 +++
desktop/source/deployment/registry/package/dp_package.cxx |4 +++-
3 files changed, 9 insertions(+), 8 deletions(-)
New commits:
commit b4848def4684ad277af23a10d73b4b5c9cb201fb
Author: Takeshi Abe
Date: Mon May 18 14:10:21 2015 +0900
desktop: simplify code by std::none_of
Change-Id: Ie69927f3a1e0a8049ea7e15f949e17d5b9f15fce
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 3989e2d..a36be54 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -32,6 +32,7 @@
#include
#include
#include
+#include
#define USER_PACKAGE_MANAGER"user"
#define SHARED_PACKAGE_MANAGER "shared"
@@ -982,9 +983,8 @@ void ExtensionBox_Impl::addEventListenerOnce(
{
//make sure to only add the listener once
cleanVecListenerAdded();
-if ( ::std::find_if(m_vListenerAdded.begin(), m_vListenerAdded.end(),
-FindWeakRef(extension))
- == m_vListenerAdded.end())
+if ( ::std::none_of(m_vListenerAdded.begin(), m_vListenerAdded.end(),
+FindWeakRef(extension)) )
{
extension->addEventListener( uno::Reference< lang::XEventListener > (
m_xRemoveListener, uno::UNO_QUERY ) );
diff --git a/desktop/source/deployment/manager/dp_manager.cxx
b/desktop/source/deployment/manager/dp_manager.cxx
index 3ddc5f8..291206e 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -62,6 +62,7 @@
#include "dp_descriptioninfoset.hxx"
#include "dp_commandenvironments.hxx"
#include "dp_properties.hxx"
+#include
using namespace ::dp_misc;
using namespace ::com::sun::star;
@@ -214,8 +215,7 @@ void PackageManagerImpl::initActivationLayer(
{
OUString const & tempEntry = tempEntries[ pos ];
const MatchTempDir match( tempEntry );
-if (::std::find_if( id2temp.begin(), id2temp.end(), match ) ==
-id2temp.end())
+if (::std::none_of( id2temp.begin(), id2temp.end(), match ))
{
const OUString url(
makeURL(m_activePackages_expanded, tempEntry ) );
@@ -1336,8 +1336,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
//installed the extension it was already checked if there is one
with the
//same identifier.
const MatchTempDir match(titleEncoded);
-if (::std::find_if( id2temp.begin(), id2temp.end(), match ) ==
-id2temp.end())
+if (::std::none_of( id2temp.begin(), id2temp.end(), match ))
{
// The folder was not found in the data base, so it must be
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx
b/desktop/source/deployment/registry/package/dp_package.cxx
index 3582479..51778a9 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -65,6 +65,8 @@
#include
#include
#include
+
+#include
#include
#include "dp_extbackenddb.hxx"
@@ -1524,7 +1526,7 @@ void BackendImpl::PackageImpl::scanBundle(
//We make sure that we only create one XPackage for a particular URL.
//Sometime programmers insert the same URL several times in the
manifest
//which may lead to DisposedExceptions.
-if (bundle.end() == std::find_if(bundle.begin(), bundle.end(),
XPackage_eq(url)))
+if (std::none_of(bundle.begin(), bundle.end(), XPackage_eq(url)))
{
const Reference xPackage(
bindBundleItem( url, mediaType, false, OUString(), xCmdEnv ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basegfx/Library_basegfx.mk basegfx/source include/basegfx
basegfx/Library_basegfx.mk |1
basegfx/source/tuple/b3i64tuple.cxx | 29 --
include/basegfx/range/b3irange.hxx | 10 -
include/basegfx/tuple/b3i64tuple.hxx | 346 ---
4 files changed, 386 deletions(-)
New commits:
commit 19fc914aa6ab19890abf0e25712049e3ff9957ae
Author: Zsolt Bölöny
Date: Tue May 19 00:00:46 2015 +0200
Remove B3I64Tuple, it's not used by anything
Change-Id: Ie1b05375a8e8d634e6ef6b2bf6edde65b32574bd
Reviewed-on: https://gerrit.libreoffice.org/15811
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index ac5878a..0c1ff0f 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -81,7 +81,6 @@ $(eval $(call gb_Library_add_exception_objects,basegfx,\
basegfx/source/tuple/b2i64tuple \
basegfx/source/tuple/b2ituple \
basegfx/source/tuple/b3dtuple \
-basegfx/source/tuple/b3i64tuple \
basegfx/source/tuple/b3ituple \
basegfx/source/vector/b2dvector \
basegfx/source/vector/b2ivector \
diff --git a/basegfx/source/tuple/b3i64tuple.cxx
b/basegfx/source/tuple/b3i64tuple.cxx
deleted file mode 100644
index ac7c879..000
--- a/basegfx/source/tuple/b3i64tuple.cxx
+++ /dev/null
@@ -1,29 +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 .
- */
-
-#include
-#include
-
-namespace { struct EmptyTuple : public rtl::Static {}; }
-
-namespace basegfx
-{
-} // end of namespace basegfx
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/b3irange.hxx
b/include/basegfx/range/b3irange.hxx
index 4d3f0c7..5a51571 100644
--- a/include/basegfx/range/b3irange.hxx
+++ b/include/basegfx/range/b3irange.hxx
@@ -23,7 +23,6 @@
#include
#include
#include
-#include
#include
#include
@@ -160,15 +159,6 @@ namespace basegfx
);
}
-B3I64Tuple getRange() const
-{
-return B3I64Tuple(
-maRangeX.getRange(),
-maRangeY.getRange(),
-maRangeZ.getRange()
-);
-}
-
B3DPoint getCenter() const
{
return B3DPoint(
diff --git a/include/basegfx/tuple/b3i64tuple.hxx
b/include/basegfx/tuple/b3i64tuple.hxx
deleted file mode 100644
index 6875ae9..000
--- a/include/basegfx/tuple/b3i64tuple.hxx
+++ /dev/null
@@ -1,346 +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_BASEGFX_TUPLE_B3I64TUPLE_HXX
-#define INCLUDED_BASEGFX_TUPLE_B3I64TUPLE_HXX
-
-#include
-#include
-#include
-
-
-namespace basegfx
-{
-/** Base class for all Points/Vectors with three sal_Int64 values
-
-This class provides all methods common to Point
-avd Vector classes which are derived from here.
-
-@derive Use this class to implement Points or Vectors
-which are based on three sal_Int64 values
-*/
-class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED B3I64Tuple
-{
-protected:
-sal_Int64 mnX;
-sal_Int64 mnY;
-sal_Int64 mnZ;
-
-public:
-/** Create a
[Libreoffice-commits] core.git: basic/source
basic/source/comp/basiccharclass.cxx | 78 ++-
basic/source/comp/scanner.cxx|8 +--
basic/source/comp/token.cxx |2
basic/source/inc/basiccharclass.hxx | 13 +
4 files changed, 14 insertions(+), 87 deletions(-)
New commits:
commit 563a3935b8c2bfeaf18007019a1bbb4e1133bf11
Author: Arnaud Versini
Date: Sat May 23 15:22:28 2015 +0200
BASIC: Remove BasicCharClass::IsLetterTab
Change-Id: Ib6a13cb7a5725d451c0f8d64c2c543a8a9ec2ad0
Reviewed-on: https://gerrit.libreoffice.org/15876
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/basic/source/comp/basiccharclass.cxx
b/basic/source/comp/basiccharclass.cxx
index 8e404cc..415e64f 100644
--- a/basic/source/comp/basiccharclass.cxx
+++ b/basic/source/comp/basiccharclass.cxx
@@ -23,78 +23,12 @@
#include
#include
-BasicCharClass::BasicCharClass()
-{
- for( sal_uInt16 i = 0; i < 256; ++i )
-IsLetterTab[i] = false;
-
- IsLetterTab[0xC0] = true; // Ã , CAPITAL LETTER A WITH GRAVE ACCENT
- IsLetterTab[0xC1] = true; // Ã , CAPITAL LETTER A WITH ACUTE ACCENT
- IsLetterTab[0xC2] = true; // Ã , CAPITAL LETTER A WITH CIRCUMFLEX ACCENT
- IsLetterTab[0xC3] = true; // Ã , CAPITAL LETTER A WITH TILDE
- IsLetterTab[0xC4] = true; // Ã , CAPITAL LETTER A WITH DIAERESIS
- IsLetterTab[0xC5] = true; // Ã
, CAPITAL LETTER A WITH RING ABOVE
- IsLetterTab[0xC6] = true; // Ã , CAPITAL LIGATURE AE
- IsLetterTab[0xC7] = true; // Ã , CAPITAL LETTER C WITH CEDILLA
- IsLetterTab[0xC8] = true; // Ã , CAPITAL LETTER E WITH GRAVE ACCENT
- IsLetterTab[0xC9] = true; // Ã , CAPITAL LETTER E WITH ACUTE ACCENT
- IsLetterTab[0xCA] = true; // Ã , CAPITAL LETTER E WITH CIRCUMFLEX ACCENT
- IsLetterTab[0xCB] = true; // Ã , CAPITAL LETTER E WITH DIAERESIS
- IsLetterTab[0xCC] = true; // Ã , CAPITAL LETTER I WITH GRAVE ACCENT
- IsLetterTab[0xCD] = true; // Ã , CAPITAL LETTER I WITH ACUTE ACCENT
- IsLetterTab[0xCE] = true; // Ã , CAPITAL LETTER I WITH CIRCUMFLEX ACCENT
- IsLetterTab[0xCF] = true; // Ã , CAPITAL LETTER I WITH DIAERESIS
- IsLetterTab[0xD0] = true; // Ã , CAPITAL LETTER ETH
- IsLetterTab[0xD1] = true; // Ã , CAPITAL LETTER N WITH TILDE
- IsLetterTab[0xD2] = true; // Ã , CAPITAL LETTER O WITH GRAVE ACCENT
- IsLetterTab[0xD3] = true; // Ã , CAPITAL LETTER O WITH ACUTE ACCENT
- IsLetterTab[0xD4] = true; // Ã , CAPITAL LETTER O WITH CIRCUMFLEX ACCENT
- IsLetterTab[0xD5] = true; // Ã , CAPITAL LETTER O WITH TILDE
- IsLetterTab[0xD6] = true; // Ã , CAPITAL LETTER O WITH DIAERESIS
- IsLetterTab[0xD8] = true; // Ã , CAPITAL LETTER O WITH STROKE
- IsLetterTab[0xD9] = true; // Ã , CAPITAL LETTER U WITH GRAVE ACCENT
- IsLetterTab[0xDA] = true; // Ã , CAPITAL LETTER U WITH ACUTE ACCENT
- IsLetterTab[0xDB] = true; // Ã , CAPITAL LETTER U WITH CIRCUMFLEX ACCENT
- IsLetterTab[0xDC] = true; // Ã , CAPITAL LETTER U WITH DIAERESIS
- IsLetterTab[0xDD] = true; // Ã , CAPITAL LETTER Y WITH ACUTE ACCENT
- IsLetterTab[0xDE] = true; // Ã , CAPITAL LETTER THORN
- IsLetterTab[0xDF] = true; // Ã , SMALL LETTER SHARP S
- IsLetterTab[0xE0] = true; // Ã , SMALL LETTER A WITH GRAVE ACCENT
- IsLetterTab[0xE1] = true; // á , SMALL LETTER A WITH ACUTE ACCENT
- IsLetterTab[0xE2] = true; // â , SMALL LETTER A WITH CIRCUMFLEX ACCENT
- IsLetterTab[0xE3] = true; // ã , SMALL LETTER A WITH TILDE
- IsLetterTab[0xE4] = true; // ä , SMALL LETTER A WITH DIAERESIS
- IsLetterTab[0xE5] = true; // å , SMALL LETTER A WITH RING ABOVE
- IsLetterTab[0xE6] = true; // æ , SMALL LIGATURE AE
- IsLetterTab[0xE7] = true; // ç , SMALL LETTER C WITH CEDILLA
- IsLetterTab[0xE8] = true; // è , SMALL LETTER E WITH GRAVE ACCENT
- IsLetterTab[0xE9] = true; // é , SMALL LETTER E WITH ACUTE ACCENT
- IsLetterTab[0xEA] = true; // ê , SMALL LETTER E WITH CIRCUMFLEX ACCENT
- IsLetterTab[0xEB] = true; // ë , SMALL LETTER E WITH DIAERESIS
- IsLetterTab[0xEC] = true; // ì , SMALL LETTER I WITH GRAVE ACCENT
- IsLetterTab[0xED] = true; // Ã , SMALL LETTER I WITH ACUTE ACCENT
- IsLetterTab[0xEE] = true; // î , SMALL LETTER I WITH CIRCUMFLEX ACCENT
- IsLetterTab[0xEF] = true; // ï , SMALL LETTER I WITH DIAERESIS
- IsLetterTab[0xF0] = true; // ð , SMALL LETTER ETH
- IsLetterTab[0xF1] = true; // ñ , SMALL LETTER N WITH TILDE
- IsLetterTab[0xF2] = true; // ò , SMALL LETTER O WITH GRAVE ACCENT
- IsLetterTab[0xF3] = true; // ó , SMALL LETTER O WITH ACUTE ACCENT
- IsLetterTab[0xF4] = true; // ô , SMALL LETTER O WITH CIRCUMFLEX ACCENT
- IsLetterTab[0xF5] = true; // õ , SMALL LETTER O WITH TILDE
- IsLetterTab[0xF6] = true; // ö , SMALL LETTER O WITH DIAERESIS
- IsLetterTab[0xF8] = true; // ø , SMALL LETTER O WITH OBLIQUE BAR
- IsLetterTab[0xF9] = true; // ù , SMALL LETTER U WITH GRAVE ACCENT
- IsLetterTab[0xFA] = true; // ú , SMALL LETTER U WITH
[Libreoffice-commits] online.git: loolwsd/LOOLSession.cpp
loolwsd/LOOLSession.cpp | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 029a41ba81ab2abdf35e16dce002b1e6f93c7f1a
Author: Jan Holesovsky
Date: Tue May 26 10:08:27 2015 +0200
Fix non-debug build.
diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index b93cba5..96e4dd4 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -382,12 +382,19 @@ void MasterProcessSession::preSpawn()
args.push_back("--jail=" + jail.toString());
args.push_back("--losubpath=" + LOOLWSD::loSubPath);
+std::string executable;
+
#if ENABLE_DEBUG
if (LOOLWSD::runningAsRoot)
+{
args.push_back("--uid=" + std::to_string(LOOLWSD::uid));
+executable = "/usr/bin/sudo";
+}
+else
#endif
-
-const std::string executable = (LOOLWSD::runningAsRoot ? "/usr/bin/sudo" :
Application::instance().commandPath());
+{
+executable = Application::instance().commandPath();
+}
Application::instance().logger().information(Util::logPrefix() +
"Launching child: " + executable + " " + Poco::cat(std::string(" "),
args.begin(), args.end()));
___
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/core/unocore/unocrsr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ecdbd313838093055c66614d7e5793aacae7c5bd
Author: Stephan Bergmann
Date: Tue May 26 10:54:41 2015 +0200
Silence failing assert for now
...recently introduced with 692c886f937c525d6bfcb541917a5114b085efa9
"remove the
weak_ptrs on destruction too," but causing lots of CppunitTests to fail.
Change-Id: I9a958531473ba338499bac37282d934a51801e12
diff --git a/sw/source/core/unocore/unocrsr.cxx
b/sw/source/core/unocore/unocrsr.cxx
index 88c627e..265ac4f 100644
--- a/sw/source/core/unocore/unocrsr.cxx
+++ b/sw/source/core/unocore/unocrsr.cxx
@@ -40,7 +40,7 @@ SwUnoCrsr::~SwUnoCrsr()
SwDoc* pDoc = GetDoc();
if( !pDoc->IsInDtor() )
{
-#ifdef DBG_UTIL
+#ifdef DBG_UTIL_TODO
SwIterator pClient(*this);
assert(!pClient.First());
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/CppunitTest_sc_annotationshapeobj.mk sc/Module_sc.mk sc/qa tools/source tubes/source ucbhelper/source ucb/source unoidl/source unotools/source unoxml/sou
sc/CppunitTest_sc_annotationshapeobj.mk |4 + sc/Module_sc.mk |3 sc/qa/extras/scannotationshapeobj.cxx | 40 ++-- tools/source/inet/inetstrm.cxx |6 - tubes/source/contacts.cxx |2 ucb/source/cacher/cachedcontentresultset.cxx|2 ucb/source/core/FileAccess.cxx |2 ucb/source/core/cmdenv.hxx |2 ucb/source/core/identify.hxx|2 ucb/source/core/provprox.hxx|2 ucb/source/core/ucb.hxx |2 ucb/source/core/ucbcmds.cxx |2 ucb/source/core/ucbprops.hxx|2 ucb/source/core/ucbstore.cxx| 12 +-- ucb/source/core/ucbstore.hxx|2 ucb/source/ucp/cmis/cmis_datasupplier.hxx |2 ucb/source/ucp/cmis/cmis_provider.hxx |2 ucb/source/ucp/cmis/cmis_url.hxx|2 ucb/source/ucp/expand/ucpexpand.cxx |2 ucb/source/ucp/ext/ucpext_provider.hxx |2 ucb/source/ucp/file/bc.cxx |2 ucb/source/ucp/file/filcmd.hxx |2 ucb/source/ucp/file/filrec.hxx |2 ucb/source/ucp/file/filtask.hxx |2 ucb/source/ucp/file/prov.hxx|2 ucb/source/ucp/file/shell.hxx |2 ucb/source/ucp/ftp/ftpcontent.cxx |2 ucb/source/ucp/ftp/ftpcontentidentifier.hxx |2 ucb/source/ucp/ftp/ftpcontentprovider.hxx |2 ucb/source/ucp/ftp/ftpresultsetbase.cxx |2 ucb/source/ucp/ftp/ftpstrcont.hxx |4 - ucb/source/ucp/ftp/ftpurl.hxx |2 ucb/source/ucp/gio/gio_content.cxx |2 ucb/source/ucp/gio/gio_datasupplier.hxx |2 ucb/source/ucp/gio/gio_inputstream.hxx |2 ucb/source/ucp/gio/gio_outputstream.hxx |2 ucb/source/ucp/gio/gio_provider.hxx |2 ucb/source/ucp/gio/gio_seekable.hxx |2 ucb/source/ucp/gvfs/gvfs_content.hxx|2 ucb/source/ucp/gvfs/gvfs_directory.cxx |2 ucb/source/ucp/gvfs/gvfs_provider.cxx |5 - ucb/source/ucp/hierarchy/hierarchycontent.hxx |4 - ucb/source/ucp/hierarchy/hierarchydata.hxx |2 ucb/source/ucp/hierarchy/hierarchydatasource.hxx|2 ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx |2 ucb/source/ucp/hierarchy/hierarchyprovider.hxx |2 ucb/source/ucp/package/pkgcontent.hxx |2 ucb/source/ucp/package/pkgdatasupplier.cxx |2 ucb/source/ucp/package/pkgprovider.hxx |2 ucb/source/ucp/package/pkguri.hxx |2 ucb/source/ucp/tdoc/tdoc_datasupplier.cxx |2 ucb/source/ucp/tdoc/tdoc_docmgr.hxx |2 ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx |2 ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx|4 - ucb/source/ucp/tdoc/tdoc_provider.hxx |2 ucb/source/ucp/tdoc/tdoc_stgelems.hxx |2 ucb/source/ucp/webdav-neon/DAVException.hxx |2 ucb/source/ucp/webdav-neon/DAVResource.hxx |4 - ucb/source/ucp/webdav-neon/DAVSession.hxx |2 ucb/source/ucp/webdav-neon/NeonLockStore.cxx|8 +- ucb/source/ucp/webdav-neon/NeonSession.cxx |4 - ucb/source/ucp/webdav-neon/NeonUri.hxx |4 - ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx |2 ucb/source/ucp/webdav-neon/webdavprovider.hxx |2 ucb/source/ucp/webdav/DAVException.hxx |2 ucb/source/ucp/webdav/DAVResource.hxx |4 - ucb/source/ucp/webdav/DAVSession.hxx|4 - ucb/source/ucp/webdav/SerfLockStore.cxx |4 - ucb/source/ucp/webdav/SerfUri.hxx |4 - ucb/source/ucp/webdav/webdavdatasupplier.cxx|2 ucb/source/ucp/webdav/webdavprovider.hxx|2 ucb/source/ucp/webdav/webdavresponseparser.cxx |2
[Libreoffice-commits] core.git: writerfilter/CppunitTest_writerfilter_rtftok.mk writerfilter/qa
writerfilter/CppunitTest_writerfilter_rtftok.mk|6 ++
writerfilter/qa/cppunittests/rtftok/testrtftok.cxx |2 ++
2 files changed, 8 insertions(+)
New commits:
commit a30886283f50f4e05f70175d110a1c55e02037f0
Author: Caolán McNamara
Date: Tue May 26 10:06:19 2015 +0100
need DISABLE_CVE_TESTS for these tests under windows too
Change-Id: I92de8fa6a48dac9a0a09e6ebda4af9b8e4c3a1d7
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk
b/writerfilter/CppunitTest_writerfilter_rtftok.mk
index bb19800..1bdeba7 100644
--- a/writerfilter/CppunitTest_writerfilter_rtftok.mk
+++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk
@@ -17,6 +17,12 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,writerfilter_rtftok, \
writerfilter/qa/cppunittests/rtftok/testrtftok \
))
+ifeq ($(DISABLE_CVE_TESTS),TRUE)
+$(eval $(call gb_CppunitTest_add_defs,writerfilter_rtftok,\
+-DDISABLE_CVE_TESTS \
+))
+endif
+
$(eval $(call gb_CppunitTest_use_libraries,writerfilter_rtftok, \
comphelper \
cppu \
diff --git a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
index 3733767..dd9e474 100644
--- a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
+++ b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
@@ -78,9 +78,11 @@ bool RtfTest::load(const OUString&,
void RtfTest::test()
{
+#ifndef DISABLE_CVE_TESTS
testDir(OUString(),
getURLFromSrc("/writerfilter/qa/cppunittests/rtftok/data/"),
OUString());
+#endif
}
CPPUNIT_TEST_SUITE_REGISTRATION(RtfTest);
___
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' - writerfilter/CppunitTest_writerfilter_rtftok.mk writerfilter/qa
writerfilter/CppunitTest_writerfilter_rtftok.mk|6 ++
writerfilter/qa/cppunittests/rtftok/testrtftok.cxx |2 ++
2 files changed, 8 insertions(+)
New commits:
commit fbe4e09bd1c97585ff98084788e1e5066773a1ce
Author: Caolán McNamara
Date: Tue May 26 10:06:19 2015 +0100
need DISABLE_CVE_TESTS for these tests under windows too
Change-Id: I92de8fa6a48dac9a0a09e6ebda4af9b8e4c3a1d7
(cherry picked from commit a30886283f50f4e05f70175d110a1c55e02037f0)
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk
b/writerfilter/CppunitTest_writerfilter_rtftok.mk
index bb19800..1bdeba7 100644
--- a/writerfilter/CppunitTest_writerfilter_rtftok.mk
+++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk
@@ -17,6 +17,12 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,writerfilter_rtftok, \
writerfilter/qa/cppunittests/rtftok/testrtftok \
))
+ifeq ($(DISABLE_CVE_TESTS),TRUE)
+$(eval $(call gb_CppunitTest_add_defs,writerfilter_rtftok,\
+-DDISABLE_CVE_TESTS \
+))
+endif
+
$(eval $(call gb_CppunitTest_use_libraries,writerfilter_rtftok, \
comphelper \
cppu \
diff --git a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
index 3733767..dd9e474 100644
--- a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
+++ b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
@@ -78,9 +78,11 @@ bool RtfTest::load(const OUString&,
void RtfTest::test()
{
+#ifndef DISABLE_CVE_TESTS
testDir(OUString(),
getURLFromSrc("/writerfilter/qa/cppunittests/rtftok/data/"),
OUString());
+#endif
}
CPPUNIT_TEST_SUITE_REGISTRATION(RtfTest);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Defender Exploit:Win32/CVE-2010-3333
On Mon, 2015-05-25 at 09:21 -0700, marius adrian popa wrote: > grep -A 1 "CVE tests" config.log > configure:30975: checking whether to execute CVE tests > configure:30992: result: no > > file:///C:/sources/libo-core/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2010--1.rtf, aha, --disable-cve-tests didn't affect that dir. Fixed now with http://cgit.freedesktop.org/libreoffice/core/commit/?id=a30886283f50f4e05f70175d110a1c55e02037f0 you should just need to git pull -r && make now to get it to work out-of-the-box C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/edit.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 0394b69cf02075f9ab599c3d5b783b597f256ff5
Author: Jan Holesovsky
Date: Tue May 26 11:20:43 2015 +0200
Revert "rendercontext: Fix borderwindow rendering when called from class
Edit."
This is not necessary for double-buffering anyway (since
891304bb0ad3af9d8d73f947f25477abf57485a4), and breaks the
non-double-buffered
case.
This reverts commit 1926cfb9386269b81b6ca62bdc64591f2c403d03.
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 2c82672..e3079819 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1078,16 +1078,16 @@ void Edit::ImplPaintBorder(vcl::RenderContext&
rRenderContext, long nXStart, lon
aClipRgn.Move(aBorderOffs.X(), aBorderOffs.Y());
}
-vcl::Region oldRgn(rRenderContext.GetClipRegion());
-rRenderContext.SetClipRegion(aClipRgn);
+vcl::Region oldRgn(pBorder->GetClipRegion());
+pBorder->SetClipRegion(aClipRgn);
-pBorder->Paint(rRenderContext, Rectangle());
+pBorder->Paint(*pBorder, Rectangle()); // FIXME
-rRenderContext.SetClipRegion(oldRgn);
+pBorder->SetClipRegion(oldRgn);
}
else
{
-pBorder->Paint(rRenderContext, Rectangle());
+pBorder->Paint(*pBorder, Rectangle()); // FIXME
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Consolidating debugging levels (via Easy Hacks)
Hi,
we still have multiple othogonal and confusing debug levels in LibreOffice,
that can interact in funky ways, the most common ones being OSL_DEBUG_LEVEL and
DBG_UTL.
I'd like to propose to consolidate these into _one_ general debug level with no
funky interaction. As such, I'd like to work towards the following (ideally via
Easy Hacks):
- Disable all current code that is enabled by OSL_DEBUG_LEVEL > 1 by enclosing
them in "#if 0" (or alternatively: triggered by an explicit define for the
area of code e.g. say DEBUG_SW_LAYOUT)
- Once that is done, make OSL_DEBUG_LEVEL = 2 and DBG_UTL equivalent.
The goal is to have three general debug levels on one axis:
- level 0: release build
- level 1: additional debug code, but binary compatible with level 0 (same
library interface, comparable to OSL_DEBUG_LEVEL = 1)
- level 2: additional debug code, binary incompatible with level 1 and 2 (aka
DBG_UTL)
Everything beyond that should either be "#if 0"'ed or "#ifdef
DEBUG_${MODULE}_${AREA}".
Opinions? If there are no objections, I would file Easy Hacks for that.
Best,
Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/GraphicImport.cxx | 102 +-
1 file changed, 52 insertions(+), 50 deletions(-)
New commits:
commit 2cc3adf3a5fa277a6b578bd3cc1cab0d01c897eb
Author: László Németh
Date: Tue May 26 12:07:31 2015 +0200
DOCX import: fix vertical position of inline images
(regression of commit ab81e3bff2a1844be67209bc8947d539edbaf8e6)
Change-Id: Ie78f8be059b18cdd81c83a8d01f2d865ac3fec2b
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index a04c833..0111889 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1220,69 +1220,71 @@ uno::Reference< text::XTextContent >
GraphicImport::createGraphicObject( const b
uno::makeAny(true));
sal_Int32 nWidth = m_pImpl->nRightPosition -
m_pImpl->nLeftPosition;
-//adjust margins
-if( (m_pImpl->nHoriOrient == text::HoriOrientation::LEFT &&
-(m_pImpl->nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ||
-m_pImpl->nHoriRelation == text::RelOrientation::FRAME) ) ||
-(m_pImpl->nHoriOrient == text::HoriOrientation::INSIDE &&
-m_pImpl->nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ))
-m_pImpl->nLeftMargin = 0;
-if((m_pImpl->nHoriOrient == text::HoriOrientation::RIGHT &&
+if (m_pImpl->eGraphicImportType == IMPORT_AS_DETECTED_ANCHOR)
+{
+//adjust margins
+if( (m_pImpl->nHoriOrient == text::HoriOrientation::LEFT &&
+(m_pImpl->nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ||
+m_pImpl->nHoriRelation == text::RelOrientation::FRAME)
) ||
+(m_pImpl->nHoriOrient == text::HoriOrientation::INSIDE &&
+m_pImpl->nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ))
+m_pImpl->nLeftMargin = 0;
+if((m_pImpl->nHoriOrient == text::HoriOrientation::RIGHT &&
(m_pImpl->nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ||
m_pImpl->nHoriRelation == text::RelOrientation::FRAME)
) ||
-(m_pImpl->nHoriOrient == text::HoriOrientation::INSIDE &&
-m_pImpl->nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ))
-m_pImpl->nRightMargin = 0;
-// adjust top/bottom margins
-if( m_pImpl->nVertOrient == text::VertOrientation::TOP &&
+(m_pImpl->nHoriOrient == text::HoriOrientation::INSIDE &&
+m_pImpl->nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ))
+m_pImpl->nRightMargin = 0;
+// adjust top/bottom margins
+if( m_pImpl->nVertOrient == text::VertOrientation::TOP &&
( m_pImpl->nVertRelation ==
text::RelOrientation::PAGE_PRINT_AREA ||
m_pImpl->nVertRelation ==
text::RelOrientation::PAGE_FRAME))
-m_pImpl->nTopMargin = 0;
-if( m_pImpl->nVertOrient == text::VertOrientation::BOTTOM &&
+m_pImpl->nTopMargin = 0;
+if( m_pImpl->nVertOrient == text::VertOrientation::BOTTOM &&
( m_pImpl->nVertRelation ==
text::RelOrientation::PAGE_PRINT_AREA ||
m_pImpl->nVertRelation ==
text::RelOrientation::PAGE_FRAME))
-m_pImpl->nBottomMargin = 0;
-if( m_pImpl->nVertOrient == text::VertOrientation::BOTTOM &&
+m_pImpl->nBottomMargin = 0;
+if( m_pImpl->nVertOrient == text::VertOrientation::BOTTOM &&
m_pImpl->nVertRelation ==
text::RelOrientation::PAGE_PRINT_AREA )
-m_pImpl->nBottomMargin = 0;
-
-//adjust alignment
-if( m_pImpl->nHoriOrient == text::HoriOrientation::INSIDE &&
+m_pImpl->nBottomMargin = 0;
+//adjust alignment
+if( m_pImpl->nHoriOrient == text::HoriOrientation::INSIDE &&
m_pImpl->nHoriRelation == text::RelOrientation::PAGE_FRAME
)
-{
-// convert 'left to page' to 'from left - to page text
area'
-m_pImpl->nHoriOrient = text::HoriOrientation::NONE;
-m_pImpl->nHoriRelation = text::RelOrientation::PAGE_PRINT_AREA;
-m_pImpl->nLeftPosition = - nWidth;
-}
-else if( m_pImpl->nHoriOrient == text::HoriOrientation::OUTSIDE &&
+{
+// convert 'left to page' to 'from left - to page
text area'
+m_pImpl->nHoriOrient = text::HoriOrientation::NONE;
+m_pImpl->nHoriRelation =
text::RelOrientation::PAGE_PRINT_AREA;
+m_pImpl->
[Libreoffice-commits] core.git: 3 commits - cui/source editeng/source include/editeng sw/source
cui/source/inc/autocdlg.hxx |4 +-- cui/source/tabpages/autocdlg.cxx| 30 - editeng/source/editeng/impedit2.cxx |6 ++--- editeng/source/misc/acorrcfg.cxx| 12 +- editeng/source/misc/svxacorr.cxx| 42 ++-- editeng/source/misc/swafopt.cxx |4 +-- include/editeng/svxacorr.hxx| 12 +- include/editeng/swafopt.hxx |2 - sw/source/core/edit/acorrect.cxx|8 +++--- sw/source/core/edit/autofmt.cxx | 10 sw/source/core/inc/acorrect.hxx |4 +-- sw/source/uibase/docvw/edtwin.cxx |4 +-- sw/source/uibase/shells/textsh.cxx |2 - sw/source/uibase/wrtsh/wrtsh1.cxx |2 - 14 files changed, 71 insertions(+), 71 deletions(-) New commits: commit 26092f54865645722aeed596af62d20918aa2046 Author: Jan Holesovsky Date: Tue May 26 09:56:37 2015 +0200 CptlSttSent -> CapitalStartSentence. Change-Id: If9de3512c4ec6070652541c40d263afcb2a7a305 diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index a972b90..b016220 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -133,7 +133,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage OUStringsDeleteEmptyPara; OUStringsUseReplaceTbl; OUStringsCapitalStartWord; -OUStringsCptlSttSent; +OUStringsCapitalStartSentence; OUStringsUserStyle; OUStringsBullet; OUStringsBoldUnder; diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index abbe7ae..a4da64e 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -416,7 +416,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( vcl::Window* pParent, , sDeleteEmptyPara(CUI_RESSTR(RID_SVXSTR_DEL_EMPTY_PARA)) , sUseReplaceTbl(CUI_RESSTR(RID_SVXSTR_USE_REPLACE)) , sCapitalStartWord(CUI_RESSTR(RID_SVXSTR_CPTL_STT_WORD)) -, sCptlSttSent(CUI_RESSTR(RID_SVXSTR_CPTL_STT_SENT)) +, sCapitalStartSentence(CUI_RESSTR(RID_SVXSTR_CPTL_STT_SENT)) , sUserStyle(CUI_RESSTR(RID_SVXSTR_USER_STYLE)) , sBullet(CUI_RESSTR(RID_SVXSTR_BULLET)) , sBoldUnder(CUI_RESSTR(RID_SVXSTR_BOLD_UNDER)) @@ -650,8 +650,8 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* ) // The following entries have to be inserted in the same order // as in the OfaAutoFmtOptions-enum! m_pCheckLB->GetModel()->Insert(CreateEntry(sUseReplaceTbl, CBCOL_BOTH )); -m_pCheckLB->GetModel()->Insert(CreateEntry(sCapitalStartWord, CBCOL_BOTH )); -m_pCheckLB->GetModel()->Insert(CreateEntry(sCptlSttSent, CBCOL_BOTH )); +m_pCheckLB->GetModel()->Insert(CreateEntry(sCapitalStartWord, CBCOL_BOTH )); +m_pCheckLB->GetModel()->Insert(CreateEntry(sCapitalStartSentence, CBCOL_BOTH )); m_pCheckLB->GetModel()->Insert(CreateEntry(sBoldUnder, CBCOL_BOTH )); m_pCheckLB->GetModel()->Insert(CreateEntry(sDetectURL, CBCOL_BOTH )); m_pCheckLB->GetModel()->Insert(CreateEntry(sDash, CBCOL_BOTH )); commit 9fadc1dc4753862a41569651cf6357234e5e Author: Jan Holesovsky Date: Tue May 26 09:52:08 2015 +0200 Global CptlSttWrd and CptlSttWord -> CapitalStartWord Change-Id: I550456ae319a6a865f2ee951a1ddf70384ce33ef diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index db8bc8a..a972b90 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -132,7 +132,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage OUStringsDeleteEmptyPara; OUStringsUseReplaceTbl; -OUStringsCptlSttWord; +OUStringsCapitalStartWord; OUStringsCptlSttSent; OUStringsUserStyle; OUStringsBullet; diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 27efd0f..abbe7ae 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -228,7 +228,7 @@ bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet* ) sal_uLong nPos = 0; pAutoCorrect->SetAutoCorrFlag(Autocorrect, m_pCheckLB->IsChecked(nPos++)); -pAutoCorrect->SetAutoCorrFlag(CptlSttWrd, m_pCheckLB->IsChecked(nPos++)); +pAutoCorrect->SetAutoCorrFlag(CapitalStartWord, m_pCheckLB->IsChecked(nPos++)); pAutoCorrect->SetAutoCorrFlag(CapitalStartSentence, m_pCheckLB->IsChecked(nPos++)); pAutoCorrect->SetAutoCorrFlag(ChgWeightUnderl, m_pCheckLB->IsChecked(nPos++)); pAutoCorrect->SetAutoCorrFlag(SetINetAttr, m_pCheckLB->IsChecked(nPos++)); @@ -270,7 +270,7 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet* ) sal_uLong nPos = 0; m_pCheckLB->CheckEntryPos( nPos++, 0 != (nFlags & Autocorrect) ); -m_pCheckLB->CheckEntryPos( nPos++, 0 != (nFlags & CptlSttWrd) ); +m_pCheckLB->CheckEn
[Libreoffice-commits] core.git: basctl/source
basctl/source/basicide/layout.cxx |5 +
basctl/source/basicide/layout.hxx |5 +
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit dbca69b975ea8b25c040f12441d70f90cf0e9ab4
Author: Noel Grandin
Date: Tue May 26 12:42:44 2015 +0200
tdf#91575 - CRASH: when "My Macros & Dialogs Standard" window close
Change-Id: Iad4f67e78a0aa4c67f0c450e17278f873944aa23
diff --git a/basctl/source/basicide/layout.cxx
b/basctl/source/basicide/layout.cxx
index a42c99c..12ad627 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -184,7 +184,10 @@ void Layout::SplittedSide::dispose()
{
aSplitter.disposeAndClear();
for (auto i = vItems.begin(); i != vItems.end(); ++i)
+{
i->pSplit.disposeAndClear();
+i->pWin.clear();
+}
}
// Add() -- adds a new window to the side (after construction)
@@ -223,6 +226,8 @@ void Layout::SplittedSide::Remove (DockingWindow* pWin)
if (iWin == vItems.size())
return;
// remove
+vItems[iWin].pSplit.disposeAndClear();
+vItems[iWin].pWin.clear();
vItems.erase(vItems.begin() + iWin);
// if that was the first one, remove the first splitter line
if (iWin == 0 && !vItems.empty())
diff --git a/basctl/source/basicide/layout.hxx
b/basctl/source/basicide/layout.hxx
index 3400866..6d949c7 100644
--- a/basctl/source/basicide/layout.hxx
+++ b/basctl/source/basicide/layout.hxx
@@ -61,7 +61,6 @@ protected:
void Remove (DockingWindow*);
bool HasSize () const { return !bFirstSize; }
-protected:
// Window:
virtual void Resize () SAL_OVERRIDE;
virtual void DataChanged (DataChangedEvent const& rDCEvt) SAL_OVERRIDE;
@@ -117,12 +116,10 @@ private:
VclPtr pSplit;
};
std::vector vItems;
-private:
+
Point MakePoint (long, long) const;
Size MakeSize (long, long) const;
-private:
static bool IsDocking (DockingWindow const&);
-private:
DECL_LINK(SplitHdl, Splitter*);
void CheckMarginsFor (Splitter*);
void InitSplitter (Splitter&);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gdb
solenv/gdb/libreoffice/sw.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 390aa6277af88ef6d0f4c38a503848d01e801875 Author: Miklos Vajna Date: Tue May 26 12:48:13 2015 +0200 gdb: SwTxtNode -> SwTextNode Fixes the unexpected ' ~DeletedNode' lines in the output. Change-Id: I1f59c2cd986addd08e632d0bc1cc53b33048db77 diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py index 71445d5..fa73759 100644 --- a/solenv/gdb/libreoffice/sw.py +++ b/solenv/gdb/libreoffice/sw.py @@ -209,7 +209,7 @@ class BigPtrArrayPrinter(object): def _node_value(self, node): cur_indent = self.indent -if str(node.dynamic_type.target()) == "SwTxtNode": +if str(node.dynamic_type.target()) == "SwTextNode": # accessing this is completely non-obvious... # also, node.dynamic_cast(node.dynamic_type) is null? value = "TextNode " + \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/control/FieldDescControl.cxx |4 ++--
dbaccess/source/ui/tabledesign/TEditControl.cxx |6 ++
dbaccess/source/ui/tabledesign/TEditControl.hxx |1 +
3 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 15e64391aeed35e5c85876650fd8093f20958d8b
Author: Noel Grandin
Date: Tue May 26 13:08:20 2015 +0200
tdf#91543 - TABLE DESIGN window menu option Close causes BASE to crash
Change-Id: Ib169950f4e33dc71db66fd9a938838b568d2cc22
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx
b/dbaccess/source/ui/control/FieldDescControl.cxx
index ca610b1..d89e81a 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -208,8 +208,8 @@ void OFieldDescControl::dispose()
m_pType.clear();
m_pAutoIncrementValue.clear();
pFormat.clear();
-m_pVertScroll.clear();
-m_pHorzScroll.clear();
+m_pVertScroll.disposeAndClear();
+m_pHorzScroll.disposeAndClear();
TabPage::dispose();
}
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx
b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index eb0c16f..ba64896 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -85,7 +85,11 @@
OTableEditorCtrl::ClipboardInvalidator::ClipboardInvalidator(sal_uLong nTimeout,
OTableEditorCtrl::ClipboardInvalidator::~ClipboardInvalidator()
{
m_aInvalidateTimer.Stop();
+}
+void OTableEditorCtrl::ClipboardInvalidator::Stop()
+{
+m_aInvalidateTimer.Stop();
}
IMPL_LINK_NOARG_TYPED(OTableEditorCtrl::ClipboardInvalidator, OnInvalidate,
Timer *, void)
@@ -260,6 +264,8 @@ void OTableEditorCtrl::dispose()
// Reset the Undo-Manager
GetUndoManager().Clear();
+m_aInvalidate.Stop();
+
// Take possible Events from the queue
if( nCutEvent )
Application::RemoveUserEvent( nCutEvent );
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx
b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index bbd4d18..b56e8d8 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -76,6 +76,7 @@ namespace dbaui
public:
ClipboardInvalidator(sal_uLong nTimeout,OTableEditorCtrl*);
~ClipboardInvalidator();
+void Stop();
protected:
DECL_LINK_TYPED(OnInvalidate, Timer*, void);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/misc/svxacorr.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit cd2ba3124602ad9ee8f5927c385936cc5319808d
Author: Markus Mohrhard
Date: Tue May 26 13:38:22 2015 +0200
unbreak calc again
Change-Id: I13e80fc04cb35aff9efbe63cd0096bff5d177ffa
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 77e0774..76e10ac 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2826,7 +2826,8 @@ const SvxAutocorrWord*
SvxAutocorrWordList::WordMatches(const SvxAutocorrWord *p
sal_Int32 nSttWdPos = nEndPos;
// direct replacement of keywords surrounded by colons (for example,
":name:")
-bool bColonNameColon = rTxt[nEndPos] == ':' && rChk[0] == ':' &&
rChk.endsWith(":");
+bool bColonNameColon = rTxt.getLength() > nEndPos &&
+rTxt[nEndPos] == ':' && rChk[0] == ':' && rChk.endsWith(":");
if ( nEndPos + (bColonNameColon ? 1 : 0) >= rChk.getLength() -
left_wildcard - right_wildcard )
{
___
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/uibase/wrtsh/wrtsh1.cxx | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 8790303b4c220d0c5dcf78a4c438a385ffe3f030
Author: Philippe Jung
Date: Tue May 26 13:48:18 2015 +0200
tdf#91389 EDITING: Crash when deleting header
Replaced MyDlg(pParent).Execute by VclPtr equivalent
Change-Id: I7e03913665f770d694f53949e08425ba60adc6ad
Reviewed-on: https://gerrit.libreoffice.org/15908
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 99da1d4..5c04c7f 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -1771,12 +1771,13 @@ void SwWrtShell::ChangeHeaderOrFooter(
vcl::Window* pParent = &GetView().GetViewFrame()->GetWindow();
short nResult;
-if (bHeader)
-nResult = DeleteHeaderDialog(pParent).Execute();
-else
-nResult = DeleteFooterDialog(pParent).Execute();
-bExecute = nResult == RET_YES;
+if (bHeader) {
+nResult =
ScopedVclPtrInstance::Create(pParent)->Execute();
+} else {
+nResult =
ScopedVclPtrInstance::Create(pParent)->Execute();
+}
+bExecute = nResult == RET_YES;
StartAllAction();
}
if( bExecute )
___
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' - 6 commits - dbaccess/source desktop/source extensions/source formula/source include/vcl reportdesign/source scripting/source sc/source sd/sou
dbaccess/source/ui/control/RelationControl.cxx|4 dbaccess/source/ui/control/TableGrantCtrl.cxx |4 dbaccess/source/ui/control/dbtreelistbox.cxx |2 dbaccess/source/ui/dlg/directsql.cxx |2 dbaccess/source/ui/dlg/indexdialog.cxx|2 dbaccess/source/ui/querydesign/TableWindowListBox.cxx |4 dbaccess/source/ui/tabledesign/TEditControl.cxx | 10 +- desktop/source/deployment/gui/dp_gui_dialog2.cxx |8 - desktop/source/deployment/gui/dp_gui_dialog2.hxx |2 extensions/source/bibliography/bibview.cxx|2 extensions/source/propctrlr/formlinkdialog.cxx|2 formula/source/ui/dlg/funcutl.cxx |4 include/vcl/window.hxx|8 + reportdesign/source/ui/dlg/GroupsSorting.cxx |6 - reportdesign/source/ui/report/DesignView.cxx | 10 +- reportdesign/source/ui/report/ViewsWindow.cxx |2 reportdesign/source/ui/report/propbrw.cxx |2 sc/source/ui/condformat/condformatdlg.cxx |2 sc/source/ui/inc/anyrefdg.hxx | 10 ++ sc/source/ui/miscdlgs/anyrefdg.cxx|7 + sc/source/ui/navipi/content.cxx |2 sc/source/ui/pagedlg/tphf.cxx |2 sc/source/ui/view/preview.cxx |2 scripting/source/vbaevents/eventhelper.cxx|3 sd/source/ui/dlg/sdtreelb.cxx |2 sfx2/source/control/recentdocsviewitem.cxx|2 sfx2/source/dialog/templdlg.cxx |2 svtools/source/brwbox/editbrowsebox.cxx |6 - svtools/source/contnr/imivctl1.cxx|4 svtools/source/contnr/svimpbox.cxx|3 svtools/source/control/ruler.cxx |6 - svtools/source/control/tabbar.cxx |6 - svtools/source/dialogs/addresstemplate.cxx|2 svx/source/dialog/_bmpmask.cxx|4 svx/source/fmcomp/fmgridcl.cxx|2 svx/source/fmcomp/gridctrl.cxx|6 - svx/source/form/delayedevent.cxx | 14 --- svx/source/form/filtnav.cxx |2 svx/source/form/fmPropBrw.cxx |2 svx/source/form/navigatortree.cxx |2 svx/source/gallery2/galbrws1.cxx |4 svx/source/tbxctrls/colrctrl.cxx |2 svx/source/tbxctrls/grafctrl.cxx |3 sw/source/ui/config/mailconfigpage.cxx|2 sw/source/ui/dbui/addresslistdialog.cxx |2 sw/source/ui/dbui/mmoutputtypepage.cxx|4 sw/source/uibase/dochdl/swdtflvr.cxx |2 sw/source/uibase/docvw/SidebarWin.cxx |4 sw/source/uibase/shells/textsh2.cxx |2 sw/source/uibase/utlui/glbltree.cxx |3 sw/source/uibase/utlui/navipi.cxx |2 vcl/source/control/button.cxx | 14 +-- vcl/source/control/combobox.cxx |2 vcl/source/control/ctrl.cxx |6 - vcl/source/control/edit.cxx |2 vcl/source/control/fixed.cxx |4 vcl/source/control/ilstbox.cxx| 12 +- vcl/source/control/lstbox.cxx |2 vcl/source/control/scrbar.cxx |6 - vcl/source/control/slider.cxx |4 vcl/source/control/spinbtn.cxx|8 - vcl/source/control/spinfld.cxx|2 vcl/source/window/dialog.cxx |6 - vcl/source/window/dlgctrl.cxx |8 - vcl/source/window/event.cxx |9 -- vcl/source/window/globalization.cxx |2 vcl/source/window/mouse.cxx |4 vcl/source/window/window.cxx | 81 ++ vcl/source/window/window2.cxx | 22 ++-- vcl/source/window/winproc.cxx |4 70 files changed, 226 insertions(+), 169 deletions(-) New commits: commit 7dc00c7372a334bce7373cbdcd5a888cc4b37cd3 Author: Michael Meeks Date: Mon May 25 21:36:25 2015 +0100 tdf#91577 - fix unique_ptr conversion bugs in reportdesign. Change-Id: Icc94ce266d567e7aad5afb5eacf0e85699ef4107 diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index aaa3414..0a6f567 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignVi
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source
sw/source/uibase/wrtsh/wrtsh1.cxx | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 6e4922b0def9d3bebe04b48bc9055a16bb4965bf
Author: Philippe Jung
Date: Tue May 26 13:48:18 2015 +0200
tdf#91389 EDITING: Crash when deleting header
Replaced MyDlg(pParent).Execute by VclPtr equivalent
Change-Id: I7e03913665f770d694f53949e08425ba60adc6ad
Reviewed-on: https://gerrit.libreoffice.org/15908
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 08422c7..37f0553 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -1771,12 +1771,13 @@ void SwWrtShell::ChangeHeaderOrFooter(
vcl::Window* pParent = &GetView().GetViewFrame()->GetWindow();
short nResult;
-if (bHeader)
-nResult = DeleteHeaderDialog(pParent).Execute();
-else
-nResult = DeleteFooterDialog(pParent).Execute();
-bExecute = nResult == RET_YES;
+if (bHeader) {
+nResult =
ScopedVclPtrInstance::Create(pParent)->Execute();
+} else {
+nResult =
ScopedVclPtrInstance::Create(pParent)->Execute();
+}
+bExecute = nResult == RET_YES;
StartAllAction();
}
if( bExecute )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/source sw/source testtools/source toolkit/source tools/source
cui/source/tabpages/tpcolor.cxx|4 --- sw/source/core/unocore/unocoll.cxx |4 +-- sw/source/core/unocore/unodraw.cxx |2 - sw/source/core/unocore/unofield.cxx|2 - sw/source/core/unocore/unoidx.cxx |6 ++--- sw/source/core/unocore/unoobj2.cxx |4 +-- sw/source/core/unocore/unoparagraph.cxx|2 - sw/source/core/unocore/unostyle.cxx|2 - sw/source/core/view/pagepreviewlayout.cxx |8 +-- sw/source/core/view/vprint.cxx |2 - sw/source/filter/html/htmlform.cxx |2 - sw/source/filter/html/htmlnum.hxx |2 - sw/source/filter/html/htmltab.cxx | 10 - sw/source/filter/html/htmltabw.cxx |2 - sw/source/filter/html/htmlvsh.hxx |2 - sw/source/filter/html/swhtml.hxx |2 - sw/source/filter/html/wrthtml.hxx |4 +-- sw/source/filter/inc/msfilter.hxx | 10 - sw/source/filter/ww8/WW8TableInfo.hxx |2 - sw/source/filter/ww8/docxattributeoutput.cxx |4 +-- sw/source/filter/ww8/docxexportfilter.hxx |2 - sw/source/filter/ww8/rtfattributeoutput.hxx|2 - sw/source/filter/ww8/rtfexportfilter.hxx |2 - sw/source/filter/ww8/rtfsdrexport.hxx |2 - sw/source/filter/ww8/writerhelper.cxx |4 +-- sw/source/filter/ww8/writerhelper.hxx |2 - sw/source/filter/ww8/writerwordglue.cxx|4 +-- sw/source/filter/ww8/writerwordglue.hxx|2 - sw/source/filter/ww8/wrtw8esh.cxx |2 - sw/source/filter/ww8/wrtw8sty.cxx |2 - sw/source/filter/ww8/wrtww8.hxx| 16 +++ sw/source/filter/ww8/ww8attributeoutput.hxx|2 - sw/source/filter/ww8/ww8graf2.cxx |2 - sw/source/filter/ww8/ww8par.cxx|2 - sw/source/filter/ww8/ww8par.hxx| 18 - sw/source/filter/ww8/ww8par3.cxx |2 - sw/source/filter/ww8/ww8scan.cxx |2 - sw/source/filter/ww8/ww8scan.hxx |2 - sw/source/filter/ww8/ww8toolbar.hxx| 16 +++ sw/source/filter/xml/xmlbrshe.hxx |2 - sw/source/filter/xml/xmlexpit.hxx |2 - sw/source/filter/xml/xmlfmt.cxx|2 - sw/source/filter/xml/xmlfmte.cxx |2 - sw/source/filter/xml/xmlimp.cxx|2 - sw/source/filter/xml/xmlimpit.cxx |2 - sw/source/filter/xml/xmlitemi.cxx |2 - sw/source/filter/xml/xmlitmap.hxx |2 - sw/source/filter/xml/xmltble.cxx |8 +++ sw/source/ui/config/mailconfigpage.cxx |2 - sw/source/ui/dbui/dbinsdlg.cxx |2 - sw/source/ui/dbui/mmoutputpage.cxx |2 - sw/source/ui/dbui/mmoutputtypepage.cxx |2 - sw/source/ui/dialog/swdlgfact.hxx |2 - sw/source/ui/envelp/labfmt.hxx |2 - sw/source/ui/envelp/mailmrge.cxx |2 - sw/source/ui/index/swuiidxmrk.cxx |2 - sw/source/ui/misc/outline.cxx |2 - sw/source/ui/vba/vbaapplication.hxx|2 - sw/source/ui/vba/vbabookmarks.cxx |2 - sw/source/ui/vba/vbaborders.cxx|2 - sw/source/ui/vba/vbacells.cxx |2 - sw/source/ui/vba/vbadocumentproperties.cxx | 12 +-- sw/source/ui/vba/vbafield.cxx |2 - sw/source/ui/vba/vbaheadersfooters.cxx |2 - sw/source/ui/vba/vbalistgalleries.cxx |2 - sw/source/ui/vba/vbalistlevels.cxx |2 - sw/source/ui/vba/vbalisttemplates.cxx |2 - sw/source/ui/vba/vbaoptions.hxx|2 - sw/source/ui/vba/vbapanes.cxx |2 - sw/source/ui/vba/vbaparagraph.cxx |2 - sw/source/ui/vba/vbarevisions.cxx |2 - sw/source/ui/vba/vbasections.cxx |2 - sw/source/ui/vba/vbastyles.cxx |4 +-- sw/source/ui/vba/vbasystem.hxx |2 - sw/source/ui/vba/vbatablehelper.hxx|2 - sw/source/ui/vba/vbat
[Libreoffice-commits] core.git: cui/source
cui/source/inc/cuitabarea.hxx |1 -
cui/source/tabpages/tpcolor.cxx | 19 +--
2 files changed, 5 insertions(+), 15 deletions(-)
New commits:
commit 0f98a035806aed03ba56e292bc7ee17b242ff2a0
Author: Caolán McNamara
Date: Tue May 26 14:20:19 2015 +0100
Resolves: tdf#89904 allow the options color page to load/save palettes
Change-Id: I02c5d57db9ffb854b096c9382d740923e9cc3b89
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index f91b78f..f1604c7 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -662,7 +662,6 @@ private:
DECL_LINK( ClickSaveHdl_Impl, void * );
XPropertyListRef GetList();
-void HideLoadSaveEmbed();
bool GetEmbed();
void SetEmbed( bool bEmbed );
void UpdateTableName();
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 40a2880..9a09d3b 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -95,13 +95,6 @@ IMPL_LINK_NOARG(SvxColorTabPage, EmbedToggleHdl_Impl)
return 0;
}
-void SvxColorTabPage::HideLoadSaveEmbed()
-{
-m_pBtnLoad->Hide();
-m_pBtnSave->Hide();
-m_pBoxEmbed->Hide();
-}
-
void SvxColorTabPage::UpdateTableName()
{
// Truncate the name if necessary ...
@@ -165,9 +158,11 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickLoadHdl_Impl)
// FIXME: want to have a generic set and get method by type ...
if( pArea )
-pArea->SetNewColorList( pList );
+pArea->SetNewColorList(pList);
else if( pLine )
-pLine->SetNewColorList( pList );
+pLine->SetNewColorList(pList);
+else
+SetColorList(pList);
bLoaded = true;
UpdateTableName();
@@ -449,8 +444,6 @@ void SvxColorTabPage::Construct()
}
}
-
-
void SvxColorTabPage::ActivatePage( const SfxItemSet& )
{
if( nDlgType == 0 ) // area dialog
@@ -500,11 +493,9 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& )
}
}
else
-HideLoadSaveEmbed();
+m_pBoxEmbed->Hide();
}
-
-
SfxTabPage::sfxpg SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( CheckChanges_Impl() == -1L )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/unotbl.hxx | 13 -
sw/source/core/unocore/unocrsr.cxx |5 +
sw/source/core/unocore/unoobj2.cxx |2 ++
sw/source/core/unocore/unoport.cxx |6 +-
sw/source/uibase/inc/navmgr.hxx|9 +
5 files changed, 29 insertions(+), 6 deletions(-)
New commits:
commit 1925a57dee73933ffbdb3b57349b757470a8218a
Author: Bjoern Michaelsen
Date: Tue May 26 15:08:59 2015 +0200
Remove SwClients before destruction in some uno wrapper classes
- SwXTextTableCursor, SwXCellRange, SwXTextPortion, SwNavigationMgr,
SwXParaFrameEnumeration
- this was overlooked due to confusion over our bazillion different
debug modes
Change-Id: I0965184b3ffc4854c26838ff78aef06f4544a9b1
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 405d1d4..28fecfb 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -42,6 +42,7 @@
#include
#include
#include
+#include
class SwUnoCrsr;
class SwTable;
@@ -217,7 +218,6 @@ public:
SwXTextTableCursor(SwFrameFormat* pFormat, SwTableBox* pBox);
SwXTextTableCursor(SwFrameFormat& rTableFormat,
const SwTableCursor* pTableSelection);
-
DECLARE_XINTERFACE()
//XTextTableCursor
@@ -276,6 +276,12 @@ public:
SwUnoCrsr* GetCrsr();
std::shared_ptr m_pUnoCrsr;
SwFrameFormat* GetFrameFormat() const { return
const_cast(static_cast(GetRegisteredIn())); }
+~SwXTextTableCursor()
+{
+if(m_pUnoCrsr)
+m_pUnoCrsr->Remove(&aCrsrDepend);
+}
+
};
struct SwRangeDescriptor
@@ -469,6 +475,11 @@ public:
SwXCellRange(std::shared_ptr pCrsr, SwFrameFormat&
rFrameFormat, SwRangeDescriptor& rDesc);
void SetLabels(bool bFirstRowAsLabel, bool bFirstColumnAsLabel)
{ m_bFirstRowAsLabel = bFirstRowAsLabel, m_bFirstColumnAsLabel =
bFirstColumnAsLabel; }
+virtual ~SwXCellRange()
+{
+if(m_pTableCrsr)
+m_pTableCrsr->Remove(&aCursorDepend);
+}
std::vector< css::uno::Reference< css::table::XCell > > getCells();
TYPEINFO_OVERRIDE();
diff --git a/sw/source/core/unocore/unocrsr.cxx
b/sw/source/core/unocore/unocrsr.cxx
index 265ac4f..bca0bb7 100644
--- a/sw/source/core/unocore/unocrsr.cxx
+++ b/sw/source/core/unocore/unocrsr.cxx
@@ -40,10 +40,7 @@ SwUnoCrsr::~SwUnoCrsr()
SwDoc* pDoc = GetDoc();
if( !pDoc->IsInDtor() )
{
-#ifdef DBG_UTIL_TODO
-SwIterator pClient(*this);
-assert(!pClient.First());
-#endif
+assert(!static_cast(SwIterator(*this).First()));
// remove the weak_ptr the document keeps to notify about document
death
pDoc->mvUnoCrsrTbl.remove_if(
[this](const std::weak_ptr& pWeakPtr) -> bool { return
pWeakPtr.lock().get() == this; });
diff --git a/sw/source/core/unocore/unoobj2.cxx
b/sw/source/core/unocore/unoobj2.cxx
index 468ffc6..4172415 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -1712,6 +1712,8 @@ public:
}
virtual ~Impl() {
+if(m_pUnoCursor)
+m_pUnoCursor->Remove(this);
// Impl owns the cursor; delete it here: SolarMutex is locked
}
diff --git a/sw/source/core/unocore/unoport.cxx
b/sw/source/core/unocore/unoport.cxx
index 3ffb5cd..ad81d7e 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -137,7 +137,11 @@ SwXTextPortion::SwXTextPortion(
}
}
-SwXTextPortion::~SwXTextPortion() {};
+SwXTextPortion::~SwXTextPortion()
+{
+if(m_pUnoCursor)
+m_pUnoCursor->Remove(this);
+};
uno::Reference< text::XText > SwXTextPortion::getText()
throw( uno::RuntimeException, std::exception )
diff --git a/sw/source/uibase/inc/navmgr.hxx b/sw/source/uibase/inc/navmgr.hxx
index ce3128e..6eabe4c 100644
--- a/sw/source/uibase/inc/navmgr.hxx
+++ b/sw/source/uibase/inc/navmgr.hxx
@@ -14,6 +14,7 @@
#include "swtypes.hxx"
#include "calbck.hxx"
+#include "unocrsr.hxx"
class SwWrtShell;
struct SwPosition;
@@ -41,6 +42,14 @@ private:
public:
/* Constructor that initializes the shell to the current shell */
SwNavigationMgr( SwWrtShell & rShell );
+~SwNavigationMgr()
+{
+for(auto pEntry : m_entries)
+{
+if(pEntry && GetRegisteredIn() == pEntry.get())
+pEntry->Remove(this);
+}
+}
/* Can we go back in the history ? */
bool backEnabled() ;
/* Can we go forward in the history ? */
___
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' - cui/source
cui/source/inc/cuitabarea.hxx |1 -
cui/source/tabpages/tpcolor.cxx | 23 ++-
2 files changed, 6 insertions(+), 18 deletions(-)
New commits:
commit 7cefd1e30412c68f0f5cfabd785d4e083c8b11f2
Author: Caolán McNamara
Date: Tue May 26 13:58:05 2015 +0100
Resolves: tdf#89904 allow the options color page to load/save palettes
Change-Id: I02c5d57db9ffb854b096c9382d740923e9cc3b89
(cherry picked from commit 0f98a035806aed03ba56e292bc7ee17b242ff2a0)
dynamic_cast of this to the type is already is
(cherry picked from commit 004b026865839a044fb9cd2e08e5eca46a64c8fe)
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 73ec463..9ea0cf6 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -663,7 +663,6 @@ private:
DECL_LINK( ClickSaveHdl_Impl, void * );
XPropertyListRef GetList();
-void HideLoadSaveEmbed();
bool GetEmbed();
void SetEmbed( bool bEmbed );
void UpdateTableName();
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 048e458..9a09d3b 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -69,9 +69,7 @@ XPropertyListRef SvxColorTabPage::GetList()
// URGH - abstract this nicely ... for re-using SvxLoadSaveEmbed
if( !pList.is() ) {
-SvxColorTabPage *pPage = dynamic_cast< SvxColorTabPage *>( this );
-if( pPage )
-pList = pPage->GetColorList();
+pList = GetColorList();
}
return XPropertyListRef( static_cast< XPropertyList * >( pList.get() ) );
@@ -97,13 +95,6 @@ IMPL_LINK_NOARG(SvxColorTabPage, EmbedToggleHdl_Impl)
return 0;
}
-void SvxColorTabPage::HideLoadSaveEmbed()
-{
-m_pBtnLoad->Hide();
-m_pBtnSave->Hide();
-m_pBoxEmbed->Hide();
-}
-
void SvxColorTabPage::UpdateTableName()
{
// Truncate the name if necessary ...
@@ -167,9 +158,11 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickLoadHdl_Impl)
// FIXME: want to have a generic set and get method by type ...
if( pArea )
-pArea->SetNewColorList( pList );
+pArea->SetNewColorList(pList);
else if( pLine )
-pLine->SetNewColorList( pList );
+pLine->SetNewColorList(pList);
+else
+SetColorList(pList);
bLoaded = true;
UpdateTableName();
@@ -451,8 +444,6 @@ void SvxColorTabPage::Construct()
}
}
-
-
void SvxColorTabPage::ActivatePage( const SfxItemSet& )
{
if( nDlgType == 0 ) // area dialog
@@ -502,11 +493,9 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& )
}
}
else
-HideLoadSaveEmbed();
+m_pBoxEmbed->Hide();
}
-
-
SfxTabPage::sfxpg SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( CheckChanges_Impl() == -1L )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 79641] LibreOffice 4.4 most annoying bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=79641 Bug 79641 depends on bug 90155, which changed state. Bug 90155 Summary: (i3wm, Gala [elementary]) Not possible to open color dropdown https://bugs.documentfoundation.org/show_bug.cgi?id=90155 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- 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: Branch 'libreoffice-5-0' - 2 commits - vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkgdi.hxx|1 -
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 20
2 files changed, 12 insertions(+), 9 deletions(-)
New commits:
commit 3bc2079e4759a7098f0887b57d7bcd19acd9392b
Author: Caolán McNamara
Date: Wed May 20 20:39:09 2015 +0100
gtk3: fix borders
Change-Id: I7ea1198d08333d0ce95c2e6b5d7dcf8928a11838
(cherry picked from commit b04c9cac994e39d28f5f715f560e97edcca0e666)
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 8ed73fe..b59ccde 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1375,10 +1375,10 @@ bool GtkSalGraphics::getNativeControlRegion(
ControlType nType, ControlPart nPar
int y2 = aEditRect.Bottom();
rNativeBoundingRegion = aEditRect;
-rNativeContentRegion = Rectangle(x1 + padding.left + border.left,
- y1 + padding.top + border.top,
- x2 - padding.right + border.right,
- y2 - padding.bottom +
border.bottom);
+rNativeContentRegion = Rectangle(x1 + (padding.left + border.left),
+ y1 + (padding.top + border.top),
+ x2 - (padding.right +
border.right),
+ y2 - (padding.bottom +
border.bottom));
gtk_style_context_restore(mpFrameInStyle);
return true;
commit f698f884d4e0178dcc24fe8929fa92bf7fdcb251
Author: Caolán McNamara
Date: Wed May 20 12:10:34 2015 +0100
gtk3: focus rects for combobox entries
mpComboboxEntryStyle refuses to draw the left side. I have no
idea why and have burned too much time on it, so use the normal
EntryStyle and set its right junction to get the flat right side
Change-Id: Iff5fb1c1b21d2935c3817e7825b86b8e30e899eb
(cherry picked from commit 7cf1206e1e0872d8525f6012d0017917a4840783)
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index af86e7f..e0d0881 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -79,7 +79,6 @@ private:
static GtkStyleContext *mpMenuItemStyle;
static GtkStyleContext *mpSpinStyle;
static GtkStyleContext *mpComboboxStyle;
-static GtkStyleContext *mpComboboxEntryStyle;
static GtkStyleContext *mpComboboxButtonStyle;
static GtkStyleContext *mpListboxStyle;
static GtkStyleContext *mpListboxButtonStyle;
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 2a414dd..8ed73fe 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -35,7 +35,6 @@ GtkStyleContext* GtkSalGraphics::mpMenuStyle = NULL;
GtkStyleContext* GtkSalGraphics::mpMenuItemStyle = NULL;
GtkStyleContext* GtkSalGraphics::mpSpinStyle = NULL;
GtkStyleContext* GtkSalGraphics::mpComboboxStyle = NULL;
-GtkStyleContext* GtkSalGraphics::mpComboboxEntryStyle = NULL;
GtkStyleContext* GtkSalGraphics::mpComboboxButtonStyle = NULL;
GtkStyleContext* GtkSalGraphics::mpListboxStyle = NULL;
GtkStyleContext* GtkSalGraphics::mpListboxButtonStyle = NULL;
@@ -713,6 +712,10 @@ void GtkSalGraphics::PaintCombobox( GtkStateFlags flags,
cairo_t *cr,
if( nPart == PART_ENTIRE_CONTROL )
{
+gtk_style_context_save(mpEntryStyle);
+gtk_style_context_set_state(mpEntryStyle, flags);
+gtk_style_context_set_junction_sides(mpEntryStyle,
GTK_JUNCTION_RIGHT);
+
gtk_render_background(mpComboboxStyle, cr,
0, 0,
areaRect.GetWidth(), areaRect.GetHeight());
@@ -720,12 +723,14 @@ void GtkSalGraphics::PaintCombobox( GtkStateFlags flags,
cairo_t *cr,
0, 0,
areaRect.GetWidth(), areaRect.GetHeight());
-gtk_render_background(mpComboboxEntryStyle, cr,
+gtk_render_background(mpEntryStyle, cr,
0, 0,
aEditBoxRect.GetWidth(),
aEditBoxRect.GetHeight() );
-gtk_render_frame(mpComboboxEntryStyle, cr,
+gtk_render_frame(mpEntryStyle, cr,
0, 0,
aEditBoxRect.GetWidth(), aEditBoxRect.GetHeight()
);
+
+gtk_style_context_restore(mpEntryStyle);
}
gtk_render_background(mpComboboxButtonStyle, cr,
@@ -2038,7 +2043,6 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame,
GtkWidget *pWindow )
gtk_container_forall(GTK_CONTAINER(gComboBox),
get_combo_box_entry_inner_widgets,
NULL);
-mpComboboxEntryStyle =
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 2 commits - vcl/unx
vcl/unx/gtk/window/gtksalframe.cxx | 142 +++--
1 file changed, 75 insertions(+), 67 deletions(-)
New commits:
commit cd1c1acd2bc58f83183776f210a5d75c2c46037a
Author: Caolán McNamara
Date: Fri May 22 16:30:50 2015 +0100
gtk3: call gtk_window_set_accept_focus
Change-Id: I4f30f05e81e1d5539e832fda144a9fafecdce8e2
(cherry picked from commit 17ee476e21fd07a82744d667ae2d5aa86fb390df)
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx
b/vcl/unx/gtk/window/gtksalframe.cxx
index 5e519f4..4093737 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -1218,8 +1218,8 @@ static void lcl_set_accept_focus( GtkWindow* pWindow,
gboolean bAccept, bool bBe
}
}
#else
-(void)pWindow; (void)bAccept; (void)bBeforeRealize;
-//FIXME: No set_accept_focus impl
+gtk_window_set_accept_focus(pWindow, bAccept);
+(void)bBeforeRealize;
#endif
}
commit 8908f14cecf3dac2eb7081f1499d07305d701402
Author: Caolán McNamara
Date: Thu May 21 15:44:20 2015 +0100
gtk3: implement keyboard and mouse grab
Change-Id: Iff17dccc58e0fcd6bdc479e6135e067ae375dce9
(cherry picked from commit 06cb0e6d2675cff7b526f9fe2578d9727fda4404)
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx
b/vcl/unx/gtk/window/gtksalframe.cxx
index 8ca6a53..5e519f4 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -2726,90 +2726,98 @@ void GtkSalFrame::SetPointer( PointerStyle
ePointerStyle )
void GtkSalFrame::grabPointer( bool bGrab, bool bOwnerEvents )
{
-#if !GTK_CHECK_VERSION(3,0,0)
static const char* pEnv = getenv( "SAL_NO_MOUSEGRABS" );
+if (pEnv && *pEnv)
+return;
-if( m_pWindow )
+if (!m_pWindow)
+return;
+
+const int nMask = (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
+
+#if GTK_CHECK_VERSION(3,0,0)
+GdkDeviceManager* pDeviceManager =
gdk_display_get_device_manager(getGdkDisplay());
+GdkDevice* pPointer =
gdk_device_manager_get_client_pointer(pDeviceManager);
+if (bGrab)
+gdk_device_grab(pPointer, widget_get_window(m_pWindow),
GDK_OWNERSHIP_NONE, bOwnerEvents, (GdkEventMask) nMask, m_pCurrentCursor,
GDK_CURRENT_TIME);
+else
+gdk_device_ungrab(pPointer, GDK_CURRENT_TIME);
+#else
+if( bGrab )
{
-if( bGrab )
+bool bUseGdkGrab = true;
+const std::list< SalFrame* >& rFrames = getDisplay()->getFrames();
+for( std::list< SalFrame* >::const_iterator it = rFrames.begin(); it
!= rFrames.end(); ++it )
{
-bool bUseGdkGrab = true;
-const std::list< SalFrame* >& rFrames = getDisplay()->getFrames();
-for( std::list< SalFrame* >::const_iterator it = rFrames.begin();
it != rFrames.end(); ++it )
-{
-const GtkSalFrame* pFrame = static_cast< const GtkSalFrame*
>(*it);
-if( pFrame->m_bWindowIsGtkPlug )
-{
-bUseGdkGrab = false;
-break;
-}
-}
-if( bUseGdkGrab )
-{
-const int nMask = ( GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK );
-
-if( !pEnv || !*pEnv )
-gdk_pointer_grab( widget_get_window( m_pWindow ),
bOwnerEvents,
- (GdkEventMask) nMask, NULL,
m_pCurrentCursor,
- GDK_CURRENT_TIME );
-}
-else
+const GtkSalFrame* pFrame = static_cast< const GtkSalFrame* >(*it);
+if( pFrame->m_bWindowIsGtkPlug )
{
-// FIXME: for some unknown reason gdk_pointer_grab does not
-// really produce owner events for GtkPlug windows
-// the cause is yet unknown
-
-// this is of course a bad hack, especially as we cannot
-// set the right cursor this way
-if( !pEnv || !*pEnv )
-XGrabPointer( getDisplay()->GetDisplay(),
- widget_get_xid( m_pWindow ),
- bOwnerEvents,
- PointerMotionMask | ButtonPressMask |
ButtonReleaseMask,
- GrabModeAsync,
- GrabModeAsync,
- None,
- None,
- CurrentTime
-);
-
+bUseGdkGrab = false;
+break;
}
}
+if( bUseGdkGrab )
+{
+gdk_pointer_grab( widget_get_window( m_pWindow ), bOwnerEvents,
+ (GdkEventMask) nMask, NULL, m_pCurrentCursor,
+ GDK_CURRENT_T
Re: Resignation from the ESC
On Mon, 25 May 2015 12:02:48 +0200, Markus Mohrhard wrote: Hey, so I hereby resign from the ESC effective immediately. ... I enjoyed working with many great people but I believe that the project is developing in the wrong direction at the moment and that I should spend my free time in a better way. Regards, Markus sorry to hear that. you've been a great contributor to LibO so far. we will miss you. Tommy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/unx
vcl/unx/gtk/window/gtksalframe.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit acf3daaa536ab85a2d5b29f5fbb3a045f5e5fce0
Author: Caolán McNamara
Date: Fri May 22 11:34:16 2015 +0100
want to grab with owner_events true
Change-Id: Iada234df8b476cee36a1a360de7fb5b14a0d01b8
(cherry picked from commit caf14ad1c2d8d198a45fbaaeeb6b9fc653f3a68d)
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx
b/vcl/unx/gtk/window/gtksalframe.cxx
index 4093737..a43bcf8 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -2802,7 +2802,7 @@ void GtkSalFrame::grabKeyboard( bool bGrab )
if (bGrab)
{
gdk_device_grab(pKeyboard, widget_get_window(m_pWindow),
GDK_OWNERSHIP_NONE,
-FALSE, (GdkEventMask)(GDK_KEY_PRESS |
GDK_KEY_RELEASE), NULL, GDK_CURRENT_TIME);
+true, (GdkEventMask)(GDK_KEY_PRESS | GDK_KEY_RELEASE),
NULL, GDK_CURRENT_TIME);
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/tiledrendering/tiledrendering.cxx | 22 ++---
sw/source/core/crsr/findtxt.cxx| 58 +++--
2 files changed, 62 insertions(+), 18 deletions(-)
New commits:
commit 122b149826d270b8cbb26e2044f8da25b1d29c25
Author: Miklos Vajna
Date: Tue May 26 15:14:39 2015 +0200
SwPaM::Find: fix backwards-search in shape text
Change-Id: I79157853d16ead4cb4147763ef0590702b3d8be6
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 756fb9b..4d6cc99 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -226,12 +226,12 @@ void SwTiledRenderingTest::testResetSelection()
}
#if !(defined WNT || defined MACOSX)
-void lcl_search()
+void lcl_search(bool bBackward)
{
uno::Sequence
aPropertyValues(comphelper::InitPropertySequence(
{
{"SearchItem.SearchString", uno::makeAny(OUString("shape"))},
-{"SearchItem.Backward", uno::makeAny(false)}
+{"SearchItem.Backward", uno::makeAny(bBackward)}
}));
comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
}
@@ -245,24 +245,34 @@ void SwTiledRenderingTest::testSearch()
size_t nNode =
pWrtShell->getShellCrsr(false)->Start()->nNode.GetNode().GetIndex();
// First hit, in the second paragraph, before the shape.
-lcl_search();
+lcl_search(false);
CPPUNIT_ASSERT(!pWrtShell->GetDrawView()->GetTextEditObject());
size_t nActual =
pWrtShell->getShellCrsr(false)->Start()->nNode.GetNode().GetIndex();
CPPUNIT_ASSERT_EQUAL(nNode + 1, nActual);
// Next hit, in the shape.
-lcl_search();
+lcl_search(false);
CPPUNIT_ASSERT(pWrtShell->GetDrawView()->GetTextEditObject());
// Next hit, in the shape, still.
-lcl_search();
+lcl_search(false);
CPPUNIT_ASSERT(pWrtShell->GetDrawView()->GetTextEditObject());
// Last hit, in the last paragraph, after the shape.
-lcl_search();
+lcl_search(false);
CPPUNIT_ASSERT(!pWrtShell->GetDrawView()->GetTextEditObject());
nActual =
pWrtShell->getShellCrsr(false)->Start()->nNode.GetNode().GetIndex();
CPPUNIT_ASSERT_EQUAL(nNode + 7, nActual);
+
+// Now change direction and make sure that the first 2 hits are in the
shape, but not the 3rd one.
+lcl_search(true);
+CPPUNIT_ASSERT(pWrtShell->GetDrawView()->GetTextEditObject());
+lcl_search(true);
+CPPUNIT_ASSERT(pWrtShell->GetDrawView()->GetTextEditObject());
+lcl_search(true);
+CPPUNIT_ASSERT(!pWrtShell->GetDrawView()->GetTextEditObject());
+nActual =
pWrtShell->getShellCrsr(false)->Start()->nNode.GetNode().GetIndex();
+CPPUNIT_ASSERT_EQUAL(nNode + 1, nActual);
#endif
}
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index c15e5d1..741e307 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -38,6 +38,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -302,9 +303,23 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool
bSearchInNotes , utl::Te
aSearchItem.SetBackward(!bSrchForward);
// If there is an active text edit, then search there.
-if (SdrView* pSdrView = pWrtShell->GetDrawView())
+bool bEndedTextEdit = false;
+SdrView* pSdrView = pWrtShell->GetDrawView();
+if (pSdrView)
{
-if (pSdrView->GetTextEditObject())
+// If the edited object is not anchored to this node, then
ignore it.
+SdrObject* pObject = pSdrView->GetTextEditObject();
+if (pObject)
+{
+if (SwFrameFormat* pFrameFormat = FindFrameFormat(pObject))
+{
+const SwPosition* pPosition =
pFrameFormat->GetAnchor().GetContentAnchor();
+if (!pPosition || pPosition->nNode.GetIndex() !=
pNode->GetIndex())
+pObject = 0;
+}
+}
+
+if (pObject)
{
sal_uInt16 nResult =
pSdrView->GetTextEditOutlinerView()->StartSearchAndReplace(aSearchItem);
if (!nResult)
@@ -315,6 +330,7 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool
bSearchInNotes , utl::Te
pSdrView->UnmarkAll();
pWrtShell->SetCursor(&aPoint, true);
pWrtShell->Edit();
+bEndedTextEdit = true;
}
else
{
@@ -324,17 +340,35 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool
bSearchInNotes , utl::Te
}
}
-// If there are any shapes anchored to this node, search there.
-SwPaM aPaM(pNode->GetDoc()->GetNodes().GetEndO
[Libreoffice-commits] core.git: canvas/source
canvas/source/directx/dx_9rm.cxx | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) New commits: commit 90e901b3f92b3c537aaf0dab83de2a9b073e761f Author: Michael Meeks Date: Tue May 26 14:45:46 2015 +0100 tdf#91426 - fix DX canvas - missed by VclPtr / Clang plugin. Change-Id: I7969746b159051d65ea974b89ba458d0d14f466a diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx index 34e3938..ba03c53 100644 --- a/canvas/source/directx/dx_9rm.cxx +++ b/canvas/source/directx/dx_9rm.cxx @@ -226,7 +226,7 @@ namespace dxcanvas COMReference mpSwapChain; COMReferencempVertexBuffer; ::canvas::ISurfaceSharedPtr mpTexture; -::boost::scoped_ptr mpWindow; +VclPtr mpWindow; ::basegfx::B2IVectormaSize; typedef std::vector vertexCache_t; vertexCache_t maVertexCache; @@ -645,7 +645,7 @@ namespace dxcanvas return; mpTexture.reset(); -mpWindow.reset(); +mpWindow.disposeAndClear(); mhWnd=NULL; // refrain from releasing the DX9 objects. We're the only @@ -663,12 +663,11 @@ namespace dxcanvas // TODO(P2): get rid of those fine-grained locking ::osl::MutexGuard aGuard( maMutex ); -maVertexCache.reserve(1024); +maVertexCache.reserve( 1024 ); -mpWindow.reset( -VclPtr::Create( - -const_cast(&rWindow), 0) ); +mpWindow.disposeAndClear(); +mpWindow.reset( VclPtr::Create( + const_cast(&rWindow), 0) ); // system child window must not receive mouse events mpWindow->SetMouseTransparent( 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/uibase/inc/navmgr.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e8997fb9a90e82e125900a4ef4598cc89bcb9d9e
Author: Stephan Bergmann
Date: Tue May 26 15:42:27 2015 +0200
loplugin:saloverride
Change-Id: I92e0b152b892a65480d822d6ac26662972194546
diff --git a/sw/source/uibase/inc/navmgr.hxx b/sw/source/uibase/inc/navmgr.hxx
index 6eabe4c..2830959 100644
--- a/sw/source/uibase/inc/navmgr.hxx
+++ b/sw/source/uibase/inc/navmgr.hxx
@@ -42,7 +42,7 @@ private:
public:
/* Constructor that initializes the shell to the current shell */
SwNavigationMgr( SwWrtShell & rShell );
-~SwNavigationMgr()
+virtual ~SwNavigationMgr()
{
for(auto pEntry : m_entries)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc
sw/inc/unotbl.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d6d8b6f01e56be4bafa9c08a0ddb9a88803c
Author: Stephan Bergmann
Date: Tue May 26 15:50:21 2015 +0200
loplugin:saloverride
Change-Id: Iac6164f52c5b1d312a62ad7bb76704d8157aa18c
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 28fecfb..e53f157 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -276,7 +276,7 @@ public:
SwUnoCrsr* GetCrsr();
std::shared_ptr m_pUnoCrsr;
SwFrameFormat* GetFrameFormat() const { return
const_cast(static_cast(GetRegisteredIn())); }
-~SwXTextTableCursor()
+virtual ~SwXTextTableCursor()
{
if(m_pUnoCrsr)
m_pUnoCrsr->Remove(&aCrsrDepend);
___
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' - vcl/source
vcl/source/window/floatwin.cxx |4
1 file changed, 4 deletions(-)
New commits:
commit 8e3d5f7ed230c07f3f68d4b53edc2c285b04b84d
Author: Caolán McNamara
Date: Sat May 23 09:21:50 2015 +0100
Resolves: tdf#90155 don't hide+show window before initial show completes
(cherry picked from commit c4bae028efbd32c8938c3a6051d58c1f202d5b8a)
Change-Id: I16f6fb4ef025f2e464ca581fc348e8dd18981285
Reviewed-on: https://gerrit.libreoffice.org/15910
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 6b35c88..bd753bb 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -601,10 +601,6 @@ void FloatingWindow::SetTitleType( sal_uInt16 nTitle )
void FloatingWindow::StartPopupMode( const Rectangle& rRect, sal_uLong nFlags )
{
-// avoid flickering
-if ( IsVisible() )
-Show( false, SHOW_NOFOCUSCHANGE );
-
if ( IsRollUp() )
RollDown();
___
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' - vcl/source
vcl/source/window/floatwin.cxx |4
1 file changed, 4 deletions(-)
New commits:
commit abc4d0c705095582cb4a983180e73faef0d913c8
Author: Caolán McNamara
Date: Sat May 23 09:21:50 2015 +0100
Resolves: tdf#90155 don't hide+show window before initial show completes
(cherry picked from commit c4bae028efbd32c8938c3a6051d58c1f202d5b8a)
Change-Id: I16f6fb4ef025f2e464ca581fc348e8dd18981285
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index ef051fc..5d11517 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -637,10 +637,6 @@ void FloatingWindow::SetTitleType( FloatWinTitleType
nTitle )
void FloatingWindow::StartPopupMode( const Rectangle& rRect,
FloatWinPopupFlags nFlags )
{
-// avoid flickering
-if ( IsVisible() )
-Show( false, SHOW_NOFOCUSCHANGE );
-
if ( IsRollUp() )
RollDown();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlimport/data/tdf91122.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx| 15 +--
2 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 85fae98f01250a6e9d75e841e0de410f8ea8a333
Author: László Németh
Date: Tue May 26 16:30:12 2015 +0200
unit test for DOCX import fix of vertical pos. of inline images
(regression of commit ab81e3bff2a1844be67209bc8947d539edbaf8e6)
Change-Id: I329e68e7ecb9fd30de238f31c73f8de04efde9da
diff --git a/sw/qa/extras/ooxmlimport/data/tdf91122.docx
b/sw/qa/extras/ooxmlimport/data/tdf91122.docx
index 688f882..c7a45e4 100644
Binary files a/sw/qa/extras/ooxmlimport/data/tdf91122.docx and
b/sw/qa/extras/ooxmlimport/data/tdf91122.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 66b8440..89924e4 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -874,12 +874,15 @@ DECLARE_OOXMLIMPORT_TEST(testTDF91122, "tdf91122.docx")
/*
* OLE object shape: default vertical position is top in MSO, not bottom
*/
-uno::Reference xShapeProperties( getShape(1),
uno::UNO_QUERY );
-uno::Reference
xShapeDescriptor(xShapeProperties, uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("FrameShape"),
xShapeDescriptor->getShapeType());
-sal_Int16 nValue;
-xShapeProperties->getPropertyValue("VertOrient") >>= nValue;
-CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong vertical orientation",
text::VertOrientation::TOP, nValue);
+for (int i = 1; i <= 2; ++i)
+{
+uno::Reference xShapeProperties( getShape(i),
uno::UNO_QUERY );
+uno::Reference
xShapeDescriptor(xShapeProperties, uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("FrameShape"),
xShapeDescriptor->getShapeType());
+sal_Int16 nValue;
+xShapeProperties->getPropertyValue("VertOrient") >>= nValue;
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong vertical orientation",
text::VertOrientation::TOP, nValue);
+}
}
DECLARE_OOXMLIMPORT_TEST(testTDF91260, "tdf91260.docx")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/generic vcl/source
vcl/generic/glyphs/gcach_layout.cxx |6 ++
vcl/source/outdev/font.cxx |5 -
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit f76ecc3e9ce51b35fc18db55b808270079a3652b
Author: Caolán McNamara
Date: Tue May 26 15:45:30 2015 +0100
Resolves: tdf#89231 if no font has 0x202F fallback to a normal space
Change-Id: I2325c0b09ccf66ee15597251ad027b295de5502f
diff --git a/vcl/generic/glyphs/gcach_layout.cxx
b/vcl/generic/glyphs/gcach_layout.cxx
index 0eecae5..8d1c6f5 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -488,6 +488,12 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout,
ImplLayoutArgs& rArgs)
int32_t nGlyphIndex = pHbGlyphInfos[i].codepoint;
int32_t nCharPos = pHbGlyphInfos[i].cluster;
+// tdf#89231 if it's just a missing non-breaking space, then
use a normal space
+if (!nGlyphIndex && (SalLayoutFlags::ForFallback &
rArgs.mnFlags) && nCharPos >= 0 && rArgs.mpStr[nCharPos] == 0x202F)
+{
+nGlyphIndex = rFont.GetGlyphIndex(' ');
+}
+
// if needed request glyph fallback by updating LayoutArgs
if (!nGlyphIndex)
{
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 40bd5cd..216c8a6 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -2104,7 +2104,10 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout(
SalLayout* pSalLayout, ImplLay
if( nFallbackLevel < MAX_FALLBACK-1)
{
// ignore fallback font if it is the same as the original font
-if( mpFontEntry->maFontSelData.mpFontData ==
aFontSelData.mpFontData )
+// unless we are looking for a substituion for 0x202F, in which
+// case we'll just use a normal space
+if( mpFontEntry->maFontSelData.mpFontData ==
aFontSelData.mpFontData &&
+aMissingCodes.indexOf(0x202F) == -1 )
{
mpFontCache->Release( pFallbackFont );
continue;
___
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' - vcl/generic vcl/source
vcl/generic/glyphs/gcach_layout.cxx |6 ++
vcl/source/outdev/font.cxx |5 -
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit ade3f2e4a1a22b5ab412c220db223c996473d7ef
Author: Caolán McNamara
Date: Tue May 26 15:45:30 2015 +0100
Resolves: tdf#89231 if no font has 0x202F fallback to a normal space
Change-Id: I2325c0b09ccf66ee15597251ad027b295de5502f
(cherry picked from commit f76ecc3e9ce51b35fc18db55b808270079a3652b)
diff --git a/vcl/generic/glyphs/gcach_layout.cxx
b/vcl/generic/glyphs/gcach_layout.cxx
index bc65eaf..7bab5fe 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -488,6 +488,12 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout,
ImplLayoutArgs& rArgs)
int32_t nGlyphIndex = pHbGlyphInfos[i].codepoint;
int32_t nCharPos = pHbGlyphInfos[i].cluster;
+// tdf#89231 if it's just a missing non-breaking space, then
use a normal space
+if (!nGlyphIndex && (SalLayoutFlags::ForFallback &
rArgs.mnFlags) && nCharPos >= 0 && rArgs.mpStr[nCharPos] == 0x202F)
+{
+nGlyphIndex = rFont.GetGlyphIndex(' ');
+}
+
// if needed request glyph fallback by updating LayoutArgs
if (!nGlyphIndex)
{
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index a5e54e4..d4c77d5 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -2104,7 +2104,10 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout(
SalLayout* pSalLayout, ImplLay
if( nFallbackLevel < MAX_FALLBACK-1)
{
// ignore fallback font if it is the same as the original font
-if( mpFontEntry->maFontSelData.mpFontData ==
aFontSelData.mpFontData )
+// unless we are looking for a substituion for 0x202F, in which
+// case we'll just use a normal space
+if( mpFontEntry->maFontSelData.mpFontData ==
aFontSelData.mpFontData &&
+aMissingCodes.indexOf(0x202F) == -1 )
{
mpFontCache->Release( pFallbackFont );
continue;
___
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' - vcl/unx
vcl/unx/generic/gdi/cairotextrender.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 21ff1cbf000efab690e9c00f8f29a01160427a0a Author: David Tardon Date: Mon May 18 12:21:49 2015 +0200 add missing includes Change-Id: I2b091eb8c407f032f15674338c917bbe7e06d15b (cherry picked from commit 75155bcf07d296352162d0b963493b4ba0238cca) diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index 229e408..478cab3 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -22,10 +22,12 @@ #include #include #include +#include #include "generic/printergfx.hxx" #include "generic/genpspgraphics.h" #include "generic/geninst.h" +#include "generic/glyphcache.hxx" #include "PhysicalFontFace.hxx" #include "impfont.hxx" ___ 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' - basctl/source
basctl/source/basicide/layout.cxx |5 +
basctl/source/basicide/layout.hxx |5 +
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 3f5ce7de7cdc3d010738e4cffbe28b3b73676f5a
Author: Noel Grandin
Date: Tue May 26 12:42:44 2015 +0200
tdf#91575 - CRASH: when "My Macros & Dialogs Standard" window close
Change-Id: Iad4f67e78a0aa4c67f0c450e17278f873944aa23
(cherry picked from commit dbca69b975ea8b25c040f12441d70f90cf0e9ab4)
diff --git a/basctl/source/basicide/layout.cxx
b/basctl/source/basicide/layout.cxx
index a42c99c..12ad627 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -184,7 +184,10 @@ void Layout::SplittedSide::dispose()
{
aSplitter.disposeAndClear();
for (auto i = vItems.begin(); i != vItems.end(); ++i)
+{
i->pSplit.disposeAndClear();
+i->pWin.clear();
+}
}
// Add() -- adds a new window to the side (after construction)
@@ -223,6 +226,8 @@ void Layout::SplittedSide::Remove (DockingWindow* pWin)
if (iWin == vItems.size())
return;
// remove
+vItems[iWin].pSplit.disposeAndClear();
+vItems[iWin].pWin.clear();
vItems.erase(vItems.begin() + iWin);
// if that was the first one, remove the first splitter line
if (iWin == 0 && !vItems.empty())
diff --git a/basctl/source/basicide/layout.hxx
b/basctl/source/basicide/layout.hxx
index 3400866..6d949c7 100644
--- a/basctl/source/basicide/layout.hxx
+++ b/basctl/source/basicide/layout.hxx
@@ -61,7 +61,6 @@ protected:
void Remove (DockingWindow*);
bool HasSize () const { return !bFirstSize; }
-protected:
// Window:
virtual void Resize () SAL_OVERRIDE;
virtual void DataChanged (DataChangedEvent const& rDCEvt) SAL_OVERRIDE;
@@ -117,12 +116,10 @@ private:
VclPtr pSplit;
};
std::vector vItems;
-private:
+
Point MakePoint (long, long) const;
Size MakeSize (long, long) const;
-private:
static bool IsDocking (DockingWindow const&);
-private:
DECL_LINK(SplitHdl, Splitter*);
void CheckMarginsFor (Splitter*);
void InitSplitter (Splitter&);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) New commits: commit a10adead1ae4a923592073cf5bef1de05518fdd9 Author: Stephan Bergmann Date: Tue May 26 17:14:57 2015 +0200 Answer "Why is this necessary" comment Change-Id: I3d6e8e9b78c0a56190ba217ec714a8ddce124103 diff --git a/configure.ac b/configure.ac index 66177db..ed3823e 100644 --- a/configure.ac +++ b/configure.ac @@ -6652,10 +6652,10 @@ if test "$ENABLE_JAVA" != ""; then fi fi +dnl Check that the JDK found is correct architecture (at least 2 reasons to +dnl check: officebean needs to link -ljawt, and libjpipe.so needs to be +dnl loaded by java to run JunitTests: if test "$build_os" = "cygwin"; then -# Check that the JDK found is correct architecture -# Why is this necessary, we don't link with any library from the JDK I think, - shortjdkhome=`cygpath -d "$with_jdk_home"` if test "$BITNESS_OVERRIDE" = 64 -a -f "$with_jdk_home/bin/java.exe" -a "`$shortjdkhome/bin/java.exe -version 2>&1 | $GREP -i 64-bit`" = "" >/dev/null; then AC_MSG_WARN([You are building 64-bit binaries but the JDK $howfound is 32-bit]) @@ -6670,8 +6670,6 @@ if test "$ENABLE_JAVA" != ""; then fi JAVAINTERPRETER=`win_short_path_for_make "$JAVAINTERPRETER"` elif test "$cross_compiling" != "yes"; then -# at least 2 reasons to check: officebean needs to link -ljawt, -# and libjpipe.so needs to be loaded by java to run JunitTests. case $CPUNAME in AARCH64|AXP|X86_64|HPPA|IA64|POWERPC64|S390X|SPARC64) if test -f "$JAVAINTERPRETER" -a "`$JAVAINTERPRETER -version 2>&1 | $GREP -i 64-bit`" = "" >/dev/null; then ___ 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' - dbaccess/source
dbaccess/source/ui/control/FieldDescControl.cxx |4 ++--
dbaccess/source/ui/tabledesign/TEditControl.cxx |6 ++
dbaccess/source/ui/tabledesign/TEditControl.hxx |1 +
3 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 38ce0b5ccf5d4398a26304fde19f0bb42dd13b91
Author: Noel Grandin
Date: Tue May 26 13:08:20 2015 +0200
tdf#91543 - TABLE DESIGN window menu option Close causes BASE to crash
Change-Id: Ib169950f4e33dc71db66fd9a938838b568d2cc22
(cherry picked from commit 15e64391aeed35e5c85876650fd8093f20958d8b)
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx
b/dbaccess/source/ui/control/FieldDescControl.cxx
index 3cce597..bc1820e 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -208,8 +208,8 @@ void OFieldDescControl::dispose()
m_pType.clear();
m_pAutoIncrementValue.clear();
pFormat.clear();
-m_pVertScroll.clear();
-m_pHorzScroll.clear();
+m_pVertScroll.disposeAndClear();
+m_pHorzScroll.disposeAndClear();
TabPage::dispose();
}
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx
b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index eb0c16f..ba64896 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -85,7 +85,11 @@
OTableEditorCtrl::ClipboardInvalidator::ClipboardInvalidator(sal_uLong nTimeout,
OTableEditorCtrl::ClipboardInvalidator::~ClipboardInvalidator()
{
m_aInvalidateTimer.Stop();
+}
+void OTableEditorCtrl::ClipboardInvalidator::Stop()
+{
+m_aInvalidateTimer.Stop();
}
IMPL_LINK_NOARG_TYPED(OTableEditorCtrl::ClipboardInvalidator, OnInvalidate,
Timer *, void)
@@ -260,6 +264,8 @@ void OTableEditorCtrl::dispose()
// Reset the Undo-Manager
GetUndoManager().Clear();
+m_aInvalidate.Stop();
+
// Take possible Events from the queue
if( nCutEvent )
Application::RemoveUserEvent( nCutEvent );
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx
b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index bbd4d18..b56e8d8 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -76,6 +76,7 @@ namespace dbaui
public:
ClipboardInvalidator(sal_uLong nTimeout,OTableEditorCtrl*);
~ClipboardInvalidator();
+void Stop();
protected:
DECL_LINK_TYPED(OnInvalidate, Timer*, void);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/LibreOfficeKit libreofficekit/source sd/source
include/LibreOfficeKit/LibreOfficeKitEnums.h |9 -
libreofficekit/source/gtk/lokdocview.cxx |8 +++-
sd/source/ui/view/drviews1.cxx |6 ++
3 files changed, 21 insertions(+), 2 deletions(-)
New commits:
commit 96041179d4aa5e0eb543c3c5da8e493beb0ed133
Author: Miklos Vajna
Date: Tue May 26 17:00:20 2015 +0200
lokdocview: handle LOK_CALLBACK_SET_PART
Change-Id: I47fc389590d581155074fec63cca79bea3596860
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index 664baa2..c04fa3e 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -913,6 +913,8 @@ const char* LOKDocView_Impl::callbackTypeToString(int nType)
return "LOK_CALLBACK_SEARCH_NOT_FOUND";
case LOK_CALLBACK_PAGE_COUNT_CHANGED:
return "LOK_CALLBACK_PAGE_COUNT_CHANGED";
+case LOK_CALLBACK_SET_PART:
+return "LOK_CALLBACK_SET_PART";
}
return 0;
}
@@ -1015,6 +1017,11 @@ gboolean LOKDocView_Impl::callbackImpl(CallbackData*
pCallback)
m_pDocument->pClass->getDocumentSize(m_pDocument,
&m_nDocumentWidthTwips, &m_nDocumentHeightTwips);
}
break;
+case LOK_CALLBACK_SET_PART:
+{
+renderDocument(0);
+}
+break;
default:
g_assert(false);
break;
@@ -1226,7 +1233,6 @@ SAL_DLLPUBLIC_EXPORT int lok_docview_get_part(
LOKDocView* pDocView )
SAL_DLLPUBLIC_EXPORT void lok_docview_set_part( LOKDocView* pDocView, int
nPart)
{
pDocView->m_pImpl->m_pDocument->pClass->setPart(
pDocView->m_pImpl->m_pDocument, nPart );
-pDocView->m_pImpl->renderDocument(0);
}
SAL_DLLPUBLIC_EXPORT char* lok_docview_get_part_name( LOKDocView* pDocView,
int nPart )
commit 67a37be9969d8b5a0bc8ae081bc1aba697ea6ba5
Author: Miklos Vajna
Date: Tue May 26 16:58:36 2015 +0200
sd: fix LOK search result highlight when result is not on the current slide
By adding a new callback event, so clients can switch to the correct
slide.
Change-Id: I6c2388eb11ef97811cc644fe3a9d3866aa82fd75
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index ba4db82..bbcd5b9 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -148,7 +148,14 @@ typedef enum
* Clients should assume that data returned by an earlier
* lok::Document::getDocumentSize() call is no longer valid.
*/
-LOK_CALLBACK_PAGE_COUNT_CHANGED
+LOK_CALLBACK_PAGE_COUNT_CHANGED,
+
+/**
+ * The current part number is changed.
+ *
+ * Payload is a single 0-based integer.
+ */
+LOK_CALLBACK_SET_PART
}
LibreOfficeKitCallbackType;
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 9aa19da..74a77c4 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -81,6 +81,7 @@
#include
#include
+#include
using namespace com::sun::star;
@@ -1098,6 +1099,11 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
mpDrawView->AdjustMarkHdl();
}
+if (bOK)
+{
+OString aPayload = OString::number(nSelectedPage);
+GetDoc()->libreOfficeKitCallback(LOK_CALLBACK_SET_PART,
aPayload.getStr());
+}
return bOK;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source
svtools/source/control/tabbar.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit ca95160830305c507a776c3fc0b13c71dee0dbe7
Author: Caolán McNamara
Date: Tue May 26 16:21:34 2015 +0100
Push without Pop
regression from
commit fb8f83c12e991ad01f049332c022697736d03986
Date: Mon May 11 14:33:01 2015 +0900
refactor TabBar to use RenderContext
Change-Id: Ie77d23e164a880cec6ba5f5387070da1ada30760
diff --git a/svtools/source/control/tabbar.cxx
b/svtools/source/control/tabbar.cxx
index fb736eb..d84695a 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1285,7 +1285,7 @@ void TabBar::Paint(vcl::RenderContext& rRenderContext,
const Rectangle& rect)
rRenderContext.SetLineColor();
rRenderContext.SetFillColor(aSelectColor);
aDrawer.drawOverTopBorder();
-return;
+break;
}
pItem = prev();
@@ -1293,7 +1293,7 @@ void TabBar::Paint(vcl::RenderContext& rRenderContext,
const Rectangle& rect)
else
{
if (bCurrent)
-return;
+break;
pItem = NULL;
}
@@ -1301,6 +1301,7 @@ void TabBar::Paint(vcl::RenderContext& rRenderContext,
const Rectangle& rect)
if (!pItem)
pItem = pCurItem;
}
+rRenderContext.Pop();
}
void TabBar::Resize()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libetonyek
external/libetonyek/0001-add-missing-breaks.patch.1| 36
external/libetonyek/0002-remove-surplus-breaks.patch.1 | 38 +
external/libetonyek/UnpackedTarball_libetonyek.mk |2
3 files changed, 76 insertions(+)
New commits:
commit 06095843f3fbfabff7752f87042fb291185fc501
Author: David Tardon
Date: Tue May 26 17:17:03 2015 +0200
fix some problems found by coverity
Change-Id: Icaf543858298da4e6c8bb01c8820fa9755c3b7ae
diff --git a/external/libetonyek/0001-add-missing-breaks.patch.1
b/external/libetonyek/0001-add-missing-breaks.patch.1
new file mode 100644
index 000..7e11682
--- /dev/null
+++ b/external/libetonyek/0001-add-missing-breaks.patch.1
@@ -0,0 +1,36 @@
+From 54c63c653deb070c49621bea8acbc18f76118238 Mon Sep 17 00:00:00 2001
+From: David Tardon
+Date: Tue, 26 May 2015 16:56:56 +0200
+Subject: [PATCH 1/2] add missing breaks
+
+Change-Id: I6a6afd517e61aff89319348de5af3aa97093bd1d
+---
+ src/lib/KEY2Parser.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/lib/KEY2Parser.cpp b/src/lib/KEY2Parser.cpp
+index bb58efd..4ba70d2 100644
+--- a/src/lib/KEY2Parser.cpp
b/src/lib/KEY2Parser.cpp
+@@ -261,8 +261,10 @@ void PointElement::attribute(const int name, const char
*const value)
+ {
+ case IWORKToken::NS_URI_SFA | IWORKToken::x :
+ m_point.first = lexical_cast(value);
++break;
+ case IWORKToken::NS_URI_SFA | IWORKToken::y :
+ m_point.second = lexical_cast(value);
++break;
+ }
+ }
+
+@@ -358,6 +360,7 @@ void PointPathElement::attribute(const int name, const
char *const value)
+ ETONYEK_DEBUG_MSG(("unknown point path type: %s\n", value));
+ break;
+ }
++break;
+ }
+ default :
+ KEY2XMLElementContextBase::attribute(name, value);
+--
+2.4.1
+
diff --git a/external/libetonyek/0002-remove-surplus-breaks.patch.1
b/external/libetonyek/0002-remove-surplus-breaks.patch.1
new file mode 100644
index 000..be6b94a
--- /dev/null
+++ b/external/libetonyek/0002-remove-surplus-breaks.patch.1
@@ -0,0 +1,38 @@
+From 91d39222d9f120211c0189f69299898702a65d3d Mon Sep 17 00:00:00 2001
+From: David Tardon
+Date: Tue, 26 May 2015 17:01:22 +0200
+Subject: [PATCH 2/2] remove surplus breaks
+
+Change-Id: Ib98a4a5bcd7d9f9eb03874f0715b45bb141ef12d
+---
+ src/lib/KEY2Parser.cpp | 1 -
+ src/lib/contexts/IWORKStylesContext.cpp | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/src/lib/KEY2Parser.cpp b/src/lib/KEY2Parser.cpp
+index 4ba70d2..9a37dcd 100644
+--- a/src/lib/KEY2Parser.cpp
b/src/lib/KEY2Parser.cpp
+@@ -124,7 +124,6 @@ IWORKXMLContextPtr_t StylesContext::element(const int name)
+ return makeContext(getState(), name);
+
+ case IWORKToken::NS_URI_SF | IWORKToken::layoutstyle_ref :
+-break;
+ return makeContext(getState(), name, false,
m_anonymous);
+ }
+
+diff --git a/src/lib/contexts/IWORKStylesContext.cpp
b/src/lib/contexts/IWORKStylesContext.cpp
+index ef3041b..24efa1d 100644
+--- a/src/lib/contexts/IWORKStylesContext.cpp
b/src/lib/contexts/IWORKStylesContext.cpp
+@@ -43,7 +43,6 @@ IWORKXMLContextPtr_t IWORKStylesContext::element(const int
name)
+ case IWORKToken::NS_URI_SF | IWORKToken::liststyle_ref :
+ case IWORKToken::NS_URI_SF | IWORKToken::paragraphstyle_ref :
+ case IWORKToken::NS_URI_SF | IWORKToken::vector_style_ref :
+-break;
+ return makeContext(getState(), name, false,
m_anonymous);
+ }
+
+--
+2.4.1
+
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 834bef2b..24167e5 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -18,6 +18,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/0001-missing-include.patch.1 \
external/libetonyek/win_build.patch.1 \
external/libetonyek/ubsan.patch \
+ external/libetonyek/0001-add-missing-breaks.patch.1 \
+ external/libetonyek/0002-remove-surplus-breaks.patch.1 \
))
ifeq ($(COM_GCC_IS_CLANG),TRUE)
___
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' - svtools/source
svtools/source/control/tabbar.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 4ab5377b8c982279ca568dbc9c4bb974d2e00dcd
Author: Caolán McNamara
Date: Tue May 26 16:21:34 2015 +0100
Push without Pop
regression from
commit fb8f83c12e991ad01f049332c022697736d03986
Date: Mon May 11 14:33:01 2015 +0900
refactor TabBar to use RenderContext
Change-Id: Ie77d23e164a880cec6ba5f5387070da1ada30760
(cherry picked from commit ca95160830305c507a776c3fc0b13c71dee0dbe7)
diff --git a/svtools/source/control/tabbar.cxx
b/svtools/source/control/tabbar.cxx
index 09c5442..2a82733 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1285,7 +1285,7 @@ void TabBar::Paint(vcl::RenderContext& rRenderContext,
const Rectangle& rect)
rRenderContext.SetLineColor();
rRenderContext.SetFillColor(aSelectColor);
aDrawer.drawOverTopBorder();
-return;
+break;
}
pItem = prev();
@@ -1293,7 +1293,7 @@ void TabBar::Paint(vcl::RenderContext& rRenderContext,
const Rectangle& rect)
else
{
if (bCurrent)
-return;
+break;
pItem = NULL;
}
@@ -1301,6 +1301,7 @@ void TabBar::Paint(vcl::RenderContext& rRenderContext,
const Rectangle& rect)
if (!pItem)
pItem = pCurItem;
}
+rRenderContext.Pop();
}
void TabBar::Resize()
___
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' - 3 commits - external/libetonyek
external/libetonyek/0001-add-missing-breaks.patch.1| 36
external/libetonyek/0002-remove-surplus-breaks.patch.1 | 38 +
external/libetonyek/UnpackedTarball_libetonyek.mk | 11
external/libetonyek/ubsan-visibility.patch | 11
external/libetonyek/ubsan.patch| 11
5 files changed, 107 insertions(+)
New commits:
commit 1378814a8273a0c8f11fef7ca8c42315c33241bb
Author: David Tardon
Date: Tue May 26 17:17:03 2015 +0200
fix some problems found by coverity
Change-Id: Icaf543858298da4e6c8bb01c8820fa9755c3b7ae
(cherry picked from commit 06095843f3fbfabff7752f87042fb291185fc501)
diff --git a/external/libetonyek/0001-add-missing-breaks.patch.1
b/external/libetonyek/0001-add-missing-breaks.patch.1
new file mode 100644
index 000..7e11682
--- /dev/null
+++ b/external/libetonyek/0001-add-missing-breaks.patch.1
@@ -0,0 +1,36 @@
+From 54c63c653deb070c49621bea8acbc18f76118238 Mon Sep 17 00:00:00 2001
+From: David Tardon
+Date: Tue, 26 May 2015 16:56:56 +0200
+Subject: [PATCH 1/2] add missing breaks
+
+Change-Id: I6a6afd517e61aff89319348de5af3aa97093bd1d
+---
+ src/lib/KEY2Parser.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/lib/KEY2Parser.cpp b/src/lib/KEY2Parser.cpp
+index bb58efd..4ba70d2 100644
+--- a/src/lib/KEY2Parser.cpp
b/src/lib/KEY2Parser.cpp
+@@ -261,8 +261,10 @@ void PointElement::attribute(const int name, const char
*const value)
+ {
+ case IWORKToken::NS_URI_SFA | IWORKToken::x :
+ m_point.first = lexical_cast(value);
++break;
+ case IWORKToken::NS_URI_SFA | IWORKToken::y :
+ m_point.second = lexical_cast(value);
++break;
+ }
+ }
+
+@@ -358,6 +360,7 @@ void PointPathElement::attribute(const int name, const
char *const value)
+ ETONYEK_DEBUG_MSG(("unknown point path type: %s\n", value));
+ break;
+ }
++break;
+ }
+ default :
+ KEY2XMLElementContextBase::attribute(name, value);
+--
+2.4.1
+
diff --git a/external/libetonyek/0002-remove-surplus-breaks.patch.1
b/external/libetonyek/0002-remove-surplus-breaks.patch.1
new file mode 100644
index 000..be6b94a
--- /dev/null
+++ b/external/libetonyek/0002-remove-surplus-breaks.patch.1
@@ -0,0 +1,38 @@
+From 91d39222d9f120211c0189f69299898702a65d3d Mon Sep 17 00:00:00 2001
+From: David Tardon
+Date: Tue, 26 May 2015 17:01:22 +0200
+Subject: [PATCH 2/2] remove surplus breaks
+
+Change-Id: Ib98a4a5bcd7d9f9eb03874f0715b45bb141ef12d
+---
+ src/lib/KEY2Parser.cpp | 1 -
+ src/lib/contexts/IWORKStylesContext.cpp | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/src/lib/KEY2Parser.cpp b/src/lib/KEY2Parser.cpp
+index 4ba70d2..9a37dcd 100644
+--- a/src/lib/KEY2Parser.cpp
b/src/lib/KEY2Parser.cpp
+@@ -124,7 +124,6 @@ IWORKXMLContextPtr_t StylesContext::element(const int name)
+ return makeContext(getState(), name);
+
+ case IWORKToken::NS_URI_SF | IWORKToken::layoutstyle_ref :
+-break;
+ return makeContext(getState(), name, false,
m_anonymous);
+ }
+
+diff --git a/src/lib/contexts/IWORKStylesContext.cpp
b/src/lib/contexts/IWORKStylesContext.cpp
+index ef3041b..24efa1d 100644
+--- a/src/lib/contexts/IWORKStylesContext.cpp
b/src/lib/contexts/IWORKStylesContext.cpp
+@@ -43,7 +43,6 @@ IWORKXMLContextPtr_t IWORKStylesContext::element(const int
name)
+ case IWORKToken::NS_URI_SF | IWORKToken::liststyle_ref :
+ case IWORKToken::NS_URI_SF | IWORKToken::paragraphstyle_ref :
+ case IWORKToken::NS_URI_SF | IWORKToken::vector_style_ref :
+-break;
+ return makeContext(getState(), name, false,
m_anonymous);
+ }
+
+--
+2.4.1
+
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 834bef2b..24167e5 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -18,6 +18,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/0001-missing-include.patch.1 \
external/libetonyek/win_build.patch.1 \
external/libetonyek/ubsan.patch \
+ external/libetonyek/0001-add-missing-breaks.patch.1 \
+ external/libetonyek/0002-remove-surplus-breaks.patch.1 \
))
ifeq ($(COM_GCC_IS_CLANG),TRUE)
commit 6b72769c1e61b86b579b6dd8b0c221c9e618fe1a
Author: Stephan Bergmann
Date: Thu May 21 16:25:54 2015 +0100
external/libetonyek: -fsanitize=enum
e.g., during CppunitTest_writerperfect_impress
Change-Id: Ib9eb7a9ba7c9bad9cc43fbe2132ca315e2f28c0a
(cherry picked from commit 15cc77f8d3d1edfd0e8114829bc4b340c3d73b4d)
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index c531894..834bef2b 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_
[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - include/svtools svtools/source
include/svtools/RemoteFilesDialog.hxx|6 +
svtools/source/dialogs/RemoteFilesDialog.cxx | 112 ++-
2 files changed, 65 insertions(+), 53 deletions(-)
New commits:
commit e313491d890ae0fdbf4e489eb5a6287daff186a3
Author: Szymon KÅos
Date: Tue May 26 17:42:04 2015 +0200
added dispose method, which saves data only when were modified
Change-Id: I791fe3aadc7ef21e105f62fcc1fb24e88d8dfe66
diff --git a/include/svtools/RemoteFilesDialog.hxx
b/include/svtools/RemoteFilesDialog.hxx
index 32c00aa..4087188 100644
--- a/include/svtools/RemoteFilesDialog.hxx
+++ b/include/svtools/RemoteFilesDialog.hxx
@@ -38,10 +38,13 @@ class SVT_DLLPUBLIC RemoteFilesDialog : public ModalDialog
public:
RemoteFilesDialog(vcl::Window* pParent, WinBits nBits);
+virtual void dispose() SAL_OVERRIDE;
+
private:
::com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext
> m_context;
SvtRemoteDlgMode m_eMode;
+bool m_bIsUpdated;
VclPtr m_pOpen_btn;
VclPtr m_pSave_btn;
@@ -51,7 +54,8 @@ private:
std::vector m_aServices;
-void fillServicesListbox();
+void FillServicesListbox();
+unsigned int GetSelectedServicePos();
DECL_LINK ( AddServiceHdl, void * );
DECL_LINK_TYPED ( EditServiceMenuHdl, MenuButton *, void );
diff --git a/svtools/source/dialogs/RemoteFilesDialog.cxx
b/svtools/source/dialogs/RemoteFilesDialog.cxx
index b69d4bd..d43578c 100644
--- a/svtools/source/dialogs/RemoteFilesDialog.cxx
+++ b/svtools/source/dialogs/RemoteFilesDialog.cxx
@@ -11,8 +11,6 @@
using namespace ::com::sun::star::uno;
-const OUString sLocalFilePrefix = "file://";
-
RemoteFilesDialog::RemoteFilesDialog(vcl::Window* pParent, WinBits nBits)
: ModalDialog(pParent, "RemoteFilesDialog", "svt/ui/remotefilesdialog.ui")
, m_context(comphelper::getProcessComponentContext())
@@ -24,6 +22,7 @@ RemoteFilesDialog::RemoteFilesDialog(vcl::Window* pParent,
WinBits nBits)
get(m_pServices_lb, "services_lb");
m_eMode = (nBits & WB_SAVEAS) ? REMOTEDLG_MODE_SAVE : REMOTEDLG_MODE_OPEN;
+m_bIsUpdated = false;
if(m_eMode == REMOTEDLG_MODE_OPEN)
{
@@ -40,10 +39,34 @@ RemoteFilesDialog::RemoteFilesDialog(vcl::Window* pParent,
WinBits nBits)
m_pAddService_btn->SetClickHdl( LINK( this, RemoteFilesDialog,
AddServiceHdl ) );
m_pAddService_btn->SetSelectHdl( LINK( this, RemoteFilesDialog,
EditServiceMenuHdl ) );
-fillServicesListbox();
+FillServicesListbox();
}
-void RemoteFilesDialog::fillServicesListbox()
+void RemoteFilesDialog::dispose()
+{
+if(m_bIsUpdated)
+{
+Sequence< OUString > placesUrlsList(m_aServices.size());
+Sequence< OUString > placesNamesList(m_aServices.size());
+
+int i = 0;
+for(std::vector::const_iterator it = m_aServices.begin();
it != m_aServices.end(); ++it)
+{
+placesUrlsList[i] = (*it)->GetUrl();
+placesNamesList[i] = (*it)->GetName();
+++i;
+}
+
+std::shared_ptr
batch(comphelper::ConfigurationChanges::create(m_context));
+
officecfg::Office::Common::Misc::FilePickerPlacesUrls::set(placesUrlsList,
batch);
+
officecfg::Office::Common::Misc::FilePickerPlacesNames::set(placesNamesList,
batch);
+batch->commit();
+}
+
+ModalDialog::dispose();
+}
+
+void RemoteFilesDialog::FillServicesListbox()
{
m_pServices_lb->Clear();
m_aServices.clear();
@@ -52,26 +75,41 @@ void RemoteFilesDialog::fillServicesListbox()
Sequence< OUString >
placesUrlsList(officecfg::Office::Common::Misc::FilePickerPlacesUrls::get(m_context));
Sequence< OUString >
placesNamesList(officecfg::Office::Common::Misc::FilePickerPlacesNames::get(m_context));
-if(placesUrlsList.getLength() > 0 && placesNamesList.getLength() > 0)
+for(sal_Int32 nPlace = 0; nPlace < placesUrlsList.getLength() && nPlace <
placesNamesList.getLength(); ++nPlace)
{
-for(sal_Int32 nPlace = 0; nPlace < placesUrlsList.getLength() &&
nPlace < placesNamesList.getLength(); ++nPlace)
-{
-// Add only remote services, not local bookmarks
-if(placesUrlsList[nPlace].compareTo(sLocalFilePrefix,
sLocalFilePrefix.getLength()) != 0)
-{
-ServicePtr pService(new Place(placesNamesList[nPlace],
placesUrlsList[nPlace], true));
-m_aServices.push_back(pService);
+ServicePtr pService(new Place(placesNamesList[nPlace],
placesUrlsList[nPlace], true));
+m_aServices.push_back(pService);
-m_pServices_lb->InsertEntry(placesNamesList[nPlace]);
-}
+// Add to the listbox only remote services, not local bookmarks
+if(!pService->IsLocal())
+{
+m_pServices_lb->InsertEntry(placesNamesList[nPlace]);
}
+}
+if(m_pServices_lb->GetEntryCount() > 0)
m_pServices_lb->SelectEntryPos(0);
-}
el
[Libreoffice-commits] core.git: 2 commits - svx/source vcl/source
svx/source/sidebar/line/LineWidthControl.cxx |4 ++--
vcl/source/window/window.cxx | 22 +++---
2 files changed, 9 insertions(+), 17 deletions(-)
New commits:
commit 2efb9d3c9841397cca3a66714504ee25d2120bd2
Author: Caolán McNamara
Date: Tue May 26 16:59:15 2015 +0100
Related: tdf#91542 line box width cannot be changed
Change-Id: Ibbeefcff785ee76a1a7ce46d98c1006fc8fe46fc
diff --git a/svx/source/sidebar/line/LineWidthControl.cxx
b/svx/source/sidebar/line/LineWidthControl.cxx
index 6723f6b..2ee411c 100644
--- a/svx/source/sidebar/line/LineWidthControl.cxx
+++ b/svx/source/sidebar/line/LineWidthControl.cxx
@@ -263,7 +263,7 @@ void LineWidthControl::SetWidthSelect( long lValue, bool
bValuable, SfxMapUnit e
IMPL_LINK(LineWidthControl, VSSelectHdl, void *, pControl)
{
-if (pControl == &maVSWidth)
+if (pControl == maVSWidth.get())
{
sal_uInt16 iPos = maVSWidth->GetSelectItemId();
if (iPos >= 1 && iPos <= 8)
@@ -308,7 +308,7 @@ IMPL_LINK(LineWidthControl, VSSelectHdl, void *, pControl)
IMPL_LINK(LineWidthControl, MFModifyHdl, void *, pControl)
{
-if(pControl == &maMFWidth)
+if (pControl == maMFWidth.get())
{
if(maVSWidth->GetSelItem())
{
commit 662906ea642c8332428487f0766fb7394fdfd35c
Author: Caolán McNamara
Date: Tue May 26 16:36:24 2015 +0100
if foo delete foo -> delete foo
Change-Id: I62c02f8ad69ddbb1cca5b8f0e4c5673d792cb08b
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 297572e..a51e2d6 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -529,25 +529,17 @@ void Window::dispose()
// cleanup Extra Window Data, TODO: add and use ImplWinData destructor
if ( mpWindowImpl->mpWinData )
{
-if ( mpWindowImpl->mpWinData->mpExtOldText )
-delete mpWindowImpl->mpWinData->mpExtOldText;
-if ( mpWindowImpl->mpWinData->mpExtOldAttrAry )
-delete mpWindowImpl->mpWinData->mpExtOldAttrAry;
-if ( mpWindowImpl->mpWinData->mpCursorRect )
-delete mpWindowImpl->mpWinData->mpCursorRect;
-if ( mpWindowImpl->mpWinData->mpCompositionCharRects)
-delete[] mpWindowImpl->mpWinData->mpCompositionCharRects;
-if ( mpWindowImpl->mpWinData->mpFocusRect )
-delete mpWindowImpl->mpWinData->mpFocusRect;
-if ( mpWindowImpl->mpWinData->mpTrackRect )
-delete mpWindowImpl->mpWinData->mpTrackRect;
-
+delete mpWindowImpl->mpWinData->mpExtOldText;
+delete mpWindowImpl->mpWinData->mpExtOldAttrAry;
+delete mpWindowImpl->mpWinData->mpCursorRect;
+delete[] mpWindowImpl->mpWinData->mpCompositionCharRects;
+delete mpWindowImpl->mpWinData->mpFocusRect;
+delete mpWindowImpl->mpWinData->mpTrackRect;
delete mpWindowImpl->mpWinData;
}
// cleanup overlap related window data
-if ( mpWindowImpl->mpOverlapData )
-delete mpWindowImpl->mpOverlapData;
+delete mpWindowImpl->mpOverlapData;
// remove BorderWindow or Frame window data
mpWindowImpl->mpBorderWindow.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' - svx/source
svx/source/sidebar/line/LineWidthControl.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0d4d89b6687fe7c735b22e56175abd2de2133798
Author: Caolán McNamara
Date: Tue May 26 16:59:15 2015 +0100
Related: tdf#91542 line box width cannot be changed
Change-Id: Ibbeefcff785ee76a1a7ce46d98c1006fc8fe46fc
(cherry picked from commit 2efb9d3c9841397cca3a66714504ee25d2120bd2)
diff --git a/svx/source/sidebar/line/LineWidthControl.cxx
b/svx/source/sidebar/line/LineWidthControl.cxx
index 6723f6b..2ee411c 100644
--- a/svx/source/sidebar/line/LineWidthControl.cxx
+++ b/svx/source/sidebar/line/LineWidthControl.cxx
@@ -263,7 +263,7 @@ void LineWidthControl::SetWidthSelect( long lValue, bool
bValuable, SfxMapUnit e
IMPL_LINK(LineWidthControl, VSSelectHdl, void *, pControl)
{
-if (pControl == &maVSWidth)
+if (pControl == maVSWidth.get())
{
sal_uInt16 iPos = maVSWidth->GetSelectItemId();
if (iPos >= 1 && iPos <= 8)
@@ -308,7 +308,7 @@ IMPL_LINK(LineWidthControl, VSSelectHdl, void *, pControl)
IMPL_LINK(LineWidthControl, MFModifyHdl, void *, pControl)
{
-if(pControl == &maMFWidth)
+if (pControl == maMFWidth.get())
{
if(maVSWidth->GetSelItem())
{
___
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' - svtools/source svtools/uiconfig
svtools/source/dialogs/RemoteFilesDialog.cxx | 22 ++
svtools/uiconfig/ui/remotefilesdialog.ui |8
2 files changed, 30 insertions(+)
New commits:
commit 1bf41094aba59770ee12d9bdcd0dba79ac89f717
Author: Szymon KÅos
Date: Tue May 26 18:11:41 2015 +0200
added the delete service option
Change-Id: I81ddfbf3e0d856b3263d005d283279ebb58f1ffc
diff --git a/svtools/source/dialogs/RemoteFilesDialog.cxx
b/svtools/source/dialogs/RemoteFilesDialog.cxx
index d43578c..60063d9 100644
--- a/svtools/source/dialogs/RemoteFilesDialog.cxx
+++ b/svtools/source/dialogs/RemoteFilesDialog.cxx
@@ -170,6 +170,28 @@ IMPL_LINK_TYPED ( RemoteFilesDialog, EditServiceMenuHdl,
MenuButton *, pButton,
break;
};
}
+else if(sIdent == "delete_service" && m_pServices_lb->GetEntryCount() > 0)
+{
+unsigned int nSelected = m_pServices_lb->GetSelectEntryPos();
+unsigned int nPos = GetSelectedServicePos();
+
+// TODO: Confirm dialog
+
+m_aServices.erase(m_aServices.begin() + nPos);
+m_pServices_lb->RemoveEntry(nSelected);
+
+if(m_pServices_lb->GetEntryCount() > 0)
+{
+m_pServices_lb->SelectEntryPos(0);
+}
+else
+{
+m_pServices_lb->SetNoSelection();
+m_pServices_lb->Enable(false);
+}
+
+m_bIsUpdated = true;
+}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/uiconfig/ui/remotefilesdialog.ui
b/svtools/uiconfig/ui/remotefilesdialog.ui
index c01ef56..894ce8e 100644
--- a/svtools/uiconfig/ui/remotefilesdialog.ui
+++ b/svtools/uiconfig/ui/remotefilesdialog.ui
@@ -139,5 +139,13 @@
True
+
+
+True
+False
+_Delete service
+True
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/sidebar/Popup.hxx |2 ++
svx/source/sidebar/line/LinePropertyPanel.cxx |1 +
svx/source/sidebar/tools/Popup.cxx|7 ++-
3 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 2a6aa95a7af11eb091dfa9494cd810998b2e324d
Author: Caolán McNamara
Date: Tue May 26 17:33:52 2015 +0100
Resolves: tdf#91542 crash on pressing return in sidebar line popup
Change-Id: I661a51f84827326dfc33a11a02f8065d68e8333a
diff --git a/include/svx/sidebar/Popup.hxx b/include/svx/sidebar/Popup.hxx
index 4fd74d1..ebd91bb 100644
--- a/include/svx/sidebar/Popup.hxx
+++ b/include/svx/sidebar/Popup.hxx
@@ -75,6 +75,8 @@ public :
*/
void SetPopupModeEndHandler (const ::boost::function& rCallback);
+void dispose();
+
protected:
VclPtr mxControl;
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx
b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 589247e..e7348a9 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -213,6 +213,7 @@ void LinePropertyPanel::dispose()
mpFTCapStyle.clear();
mpLBCapStyle.clear();
+maLineWidthPopup.dispose();
maStyleControl.dispose();
maDashControl.dispose();
maWidthControl.dispose();
diff --git a/svx/source/sidebar/tools/Popup.cxx
b/svx/source/sidebar/tools/Popup.cxx
index 71911a5..3bd6246 100644
--- a/svx/source/sidebar/tools/Popup.cxx
+++ b/svx/source/sidebar/tools/Popup.cxx
@@ -40,12 +40,17 @@ Popup::Popup (
OSL_ASSERT(maControlCreator);
}
-Popup::~Popup()
+void Popup::dispose()
{
mxControl.disposeAndClear();
mxContainer.disposeAndClear();
}
+Popup::~Popup()
+{
+dispose();
+}
+
void Popup::Show (ToolBox& rToolBox)
{
rToolBox.SetItemDown(rToolBox.GetCurItemId(), true);
___
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/svx svx/source
include/svx/sidebar/Popup.hxx |2 ++
svx/source/sidebar/line/LinePropertyPanel.cxx |1 +
svx/source/sidebar/tools/Popup.cxx|7 ++-
3 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit de2d7448736384dfdab667a86330fcec37116c94
Author: Caolán McNamara
Date: Tue May 26 17:33:52 2015 +0100
Resolves: tdf#91542 crash on pressing return in sidebar line popup
Change-Id: I661a51f84827326dfc33a11a02f8065d68e8333a
(cherry picked from commit 2a6aa95a7af11eb091dfa9494cd810998b2e324d)
diff --git a/include/svx/sidebar/Popup.hxx b/include/svx/sidebar/Popup.hxx
index 4fd74d1..ebd91bb 100644
--- a/include/svx/sidebar/Popup.hxx
+++ b/include/svx/sidebar/Popup.hxx
@@ -75,6 +75,8 @@ public :
*/
void SetPopupModeEndHandler (const ::boost::function& rCallback);
+void dispose();
+
protected:
VclPtr mxControl;
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx
b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 589247e..e7348a9 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -213,6 +213,7 @@ void LinePropertyPanel::dispose()
mpFTCapStyle.clear();
mpLBCapStyle.clear();
+maLineWidthPopup.dispose();
maStyleControl.dispose();
maDashControl.dispose();
maWidthControl.dispose();
diff --git a/svx/source/sidebar/tools/Popup.cxx
b/svx/source/sidebar/tools/Popup.cxx
index 71911a5..3bd6246 100644
--- a/svx/source/sidebar/tools/Popup.cxx
+++ b/svx/source/sidebar/tools/Popup.cxx
@@ -40,12 +40,17 @@ Popup::Popup (
OSL_ASSERT(maControlCreator);
}
-Popup::~Popup()
+void Popup::dispose()
{
mxControl.disposeAndClear();
mxContainer.disposeAndClear();
}
+Popup::~Popup()
+{
+dispose();
+}
+
void Popup::Show (ToolBox& rToolBox)
{
rToolBox.SetItemDown(rToolBox.GetCurItemId(), true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - chart2/source editeng/source filter/source sc/source sdext/source sd/source svtools/source toolkit/source vcl/source
chart2/source/controller/dialogs/DataBrowser.cxx | 11 +--
editeng/source/editeng/impedit.hxx |2 +-
filter/source/graphicfilter/eos2met/eos2met.cxx |2 +-
filter/source/graphicfilter/idxf/dxf2mtf.cxx |2 +-
filter/source/svg/svgwriter.cxx |2 +-
sc/source/ui/docshell/sizedev.cxx|2 +-
sc/source/ui/view/gridwin4.cxx |2 +-
sd/source/filter/eppt/pptx-text.cxx |2 +-
sdext/source/pdfimport/wrapper/wrapper.cxx |6 +++---
svtools/source/control/ctrlbox.cxx |2 +-
toolkit/source/awt/vclxtoolkit.cxx |2 +-
vcl/source/edit/texteng.cxx |2 +-
vcl/source/edit/textview.cxx |2 +-
vcl/source/filter/wmf/wmfwr.cxx |2 +-
vcl/source/gdi/impanmvw.cxx |6 +++---
15 files changed, 27 insertions(+), 20 deletions(-)
New commits:
commit cc7b8dab7522886f13780950c93033e3369da285
Author: Michael Meeks
Date: Tue May 26 17:53:15 2015 +0100
tdf#91633 - dispose chart data-table entries correctly.
Change-Id: Ia26df029888f47a0395ea3c8bd7e0e51a1706c2a
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx
b/chart2/source/controller/dialogs/DataBrowser.cxx
index 1d2eebc..8f0f979 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -144,6 +144,7 @@ class SeriesHeader
{
public:
explicit SeriesHeader(vcl::Window * pParent, vcl::Window *pColorParent);
+~SeriesHeader();
void SetColor( const Color & rCol );
void SetPos( const Point & rPos );
@@ -217,6 +218,13 @@ SeriesHeader::SeriesHeader( vcl::Window * pParent,
vcl::Window *pColorParent ) :
Show();
}
+SeriesHeader::~SeriesHeader()
+{
+m_spSymbol.disposeAndClear();
+m_spSeriesName.disposeAndClear();
+m_spColorBar.disposeAndClear();
+}
+
void SeriesHeader::notifyChanges()
{
if( m_aChangeLink.IsSet())
@@ -417,8 +425,7 @@ bool lcl_SeriesHeaderHasFocus(
sal_Int32 * pOutIndex = 0 )
{
sal_Int32 nIndex = 0;
-for( ::std::vector< ::boost::shared_ptr< ::chart::impl::SeriesHeader >
>::const_iterator aIt( rSeriesHeader.begin());
- aIt != rSeriesHeader.end(); ++aIt, ++nIndex )
+for( auto aIt = rSeriesHeader.begin(); aIt != rSeriesHeader.end(); ++aIt,
++nIndex )
{
if( (*aIt)->HasFocus())
{
commit f849d96463d967214bc063f6de912a082272c395
Author: Michael Meeks
Date: Tue May 26 16:02:50 2015 +0100
tdf#91416 - fix some incorrectly allocated VirtualDevices.
Change-Id: I9ebed313827986473c60e77b7e218b4c1b2487fe
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index c6186b9..4866523 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -1069,7 +1069,7 @@ inline EditSelection ImpEditEngine::CreateSel( const
ESelection& rSel )
inline VirtualDevice* ImpEditEngine::GetVirtualDevice( const MapMode&
rMapMode, DrawModeFlags nDrawMode )
{
if ( !pVirtDev )
-pVirtDev = new VirtualDevice;
+pVirtDev = VclPtr::Create();
if ( ( pVirtDev->GetMapMode().GetMapUnit() != rMapMode.GetMapUnit() ) ||
( pVirtDev->GetMapMode().GetScaleX() != rMapMode.GetScaleX() ) ||
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx
b/filter/source/graphicfilter/eos2met/eos2met.cxx
index abda124..3acff99 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -262,7 +262,7 @@ public:
if( !pCompDev )
{
apDummyVDev.disposeAndClear();
-apDummyVDev.reset( new VirtualDevice );
+apDummyVDev.reset( VclPtr::Create() );
pCompDev = apDummyVDev.get();
}
}
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index d02c389..3dd97e2 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -776,7 +776,7 @@ bool DXF2GDIMetaFile::Convert(const DXFRepresentation &
rDXF, GDIMetaFile & rMTF
const DXFLayer * pLayer;
const DXFVPort * pVPort;
-pVirDev = new VirtualDevice;
+pVirDev = VclPtr::Create();
pDXF= &rDXF;
bStatus = true;
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index c575deb..986411f 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1652,7 +1652,7 @@ SVGActionWriter::SVGActionWriter( SVGExport& rExport,
SVGFontExport& rFontExport
mbClipAttrChanged( false ),
mbIsPlaceholderShape( false )
{
-mpVDev = new VirtualDevice;
+mpVDev = VclPtr::Create();
mpVDev->EnableOutput( false );
maTargetMapMode = MAP_100TH_MM;
maTextWriter.setVirtualDevice( mpVDev, maTargetMapMode );
diff --git
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - writerfilter/source
writerfilter/source/dmapper/GraphicImport.cxx | 102 +-
1 file changed, 52 insertions(+), 50 deletions(-)
New commits:
commit ca93124e4c9d51641b3c002132a7da8e5b0df956
Author: László Németh
Date: Tue May 26 12:07:31 2015 +0200
DOCX import: fix vertical position of inline images
(regression of commit ab81e3bff2a1844be67209bc8947d539edbaf8e6)
Change-Id: Ie78f8be059b18cdd81c83a8d01f2d865ac3fec2b
Reviewed-on: https://gerrit.libreoffice.org/15916
Reviewed-by: Joren De Cuyper
Tested-by: Joren De Cuyper
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index a04c833..0111889 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1220,69 +1220,71 @@ uno::Reference< text::XTextContent >
GraphicImport::createGraphicObject( const b
uno::makeAny(true));
sal_Int32 nWidth = m_pImpl->nRightPosition -
m_pImpl->nLeftPosition;
-//adjust margins
-if( (m_pImpl->nHoriOrient == text::HoriOrientation::LEFT &&
-(m_pImpl->nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ||
-m_pImpl->nHoriRelation == text::RelOrientation::FRAME) ) ||
-(m_pImpl->nHoriOrient == text::HoriOrientation::INSIDE &&
-m_pImpl->nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ))
-m_pImpl->nLeftMargin = 0;
-if((m_pImpl->nHoriOrient == text::HoriOrientation::RIGHT &&
+if (m_pImpl->eGraphicImportType == IMPORT_AS_DETECTED_ANCHOR)
+{
+//adjust margins
+if( (m_pImpl->nHoriOrient == text::HoriOrientation::LEFT &&
+(m_pImpl->nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ||
+m_pImpl->nHoriRelation == text::RelOrientation::FRAME)
) ||
+(m_pImpl->nHoriOrient == text::HoriOrientation::INSIDE &&
+m_pImpl->nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ))
+m_pImpl->nLeftMargin = 0;
+if((m_pImpl->nHoriOrient == text::HoriOrientation::RIGHT &&
(m_pImpl->nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ||
m_pImpl->nHoriRelation == text::RelOrientation::FRAME)
) ||
-(m_pImpl->nHoriOrient == text::HoriOrientation::INSIDE &&
-m_pImpl->nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ))
-m_pImpl->nRightMargin = 0;
-// adjust top/bottom margins
-if( m_pImpl->nVertOrient == text::VertOrientation::TOP &&
+(m_pImpl->nHoriOrient == text::HoriOrientation::INSIDE &&
+m_pImpl->nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ))
+m_pImpl->nRightMargin = 0;
+// adjust top/bottom margins
+if( m_pImpl->nVertOrient == text::VertOrientation::TOP &&
( m_pImpl->nVertRelation ==
text::RelOrientation::PAGE_PRINT_AREA ||
m_pImpl->nVertRelation ==
text::RelOrientation::PAGE_FRAME))
-m_pImpl->nTopMargin = 0;
-if( m_pImpl->nVertOrient == text::VertOrientation::BOTTOM &&
+m_pImpl->nTopMargin = 0;
+if( m_pImpl->nVertOrient == text::VertOrientation::BOTTOM &&
( m_pImpl->nVertRelation ==
text::RelOrientation::PAGE_PRINT_AREA ||
m_pImpl->nVertRelation ==
text::RelOrientation::PAGE_FRAME))
-m_pImpl->nBottomMargin = 0;
-if( m_pImpl->nVertOrient == text::VertOrientation::BOTTOM &&
+m_pImpl->nBottomMargin = 0;
+if( m_pImpl->nVertOrient == text::VertOrientation::BOTTOM &&
m_pImpl->nVertRelation ==
text::RelOrientation::PAGE_PRINT_AREA )
-m_pImpl->nBottomMargin = 0;
-
-//adjust alignment
-if( m_pImpl->nHoriOrient == text::HoriOrientation::INSIDE &&
+m_pImpl->nBottomMargin = 0;
+//adjust alignment
+if( m_pImpl->nHoriOrient == text::HoriOrientation::INSIDE &&
m_pImpl->nHoriRelation == text::RelOrientation::PAGE_FRAME
)
-{
-// convert 'left to page' to 'from left - to page text
area'
-m_pImpl->nHoriOrient = text::HoriOrientation::NONE;
-m_pImpl->nHoriRelation = text::RelOrientation::PAGE_PRINT_AREA;
-m_pImpl->nLeftPosition = - nWidth;
-}
-else if( m_pImpl->nHoriOrient == text::HoriOrientation::OUTSIDE &&
+{
+// convert 'left to page' to 'from left - to page
text area'
+m_pImpl->nHoriOrient = text::HoriOrientation::NO
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/qa
sw/qa/extras/ooxmlimport/data/tdf91122.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx| 15 +--
2 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 98e2d13ed5980c03bd6728fa48871160b1a382da
Author: László Németh
Date: Tue May 26 16:30:12 2015 +0200
unit test for DOCX import fix of vertical pos. of inline images
(regression of commit ab81e3bff2a1844be67209bc8947d539edbaf8e6)
Change-Id: I329e68e7ecb9fd30de238f31c73f8de04efde9da
Reviewed-on: https://gerrit.libreoffice.org/15917
Reviewed-by: Joren De Cuyper
Tested-by: Joren De Cuyper
diff --git a/sw/qa/extras/ooxmlimport/data/tdf91122.docx
b/sw/qa/extras/ooxmlimport/data/tdf91122.docx
index 688f882..c7a45e4 100644
Binary files a/sw/qa/extras/ooxmlimport/data/tdf91122.docx and
b/sw/qa/extras/ooxmlimport/data/tdf91122.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 66b8440..89924e4 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -874,12 +874,15 @@ DECLARE_OOXMLIMPORT_TEST(testTDF91122, "tdf91122.docx")
/*
* OLE object shape: default vertical position is top in MSO, not bottom
*/
-uno::Reference xShapeProperties( getShape(1),
uno::UNO_QUERY );
-uno::Reference
xShapeDescriptor(xShapeProperties, uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("FrameShape"),
xShapeDescriptor->getShapeType());
-sal_Int16 nValue;
-xShapeProperties->getPropertyValue("VertOrient") >>= nValue;
-CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong vertical orientation",
text::VertOrientation::TOP, nValue);
+for (int i = 1; i <= 2; ++i)
+{
+uno::Reference xShapeProperties( getShape(i),
uno::UNO_QUERY );
+uno::Reference
xShapeDescriptor(xShapeProperties, uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("FrameShape"),
xShapeDescriptor->getShapeType());
+sal_Int16 nValue;
+xShapeProperties->getPropertyValue("VertOrient") >>= nValue;
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong vertical orientation",
text::VertOrientation::TOP, nValue);
+}
}
DECLARE_OOXMLIMPORT_TEST(testTDF91260, "tdf91260.docx")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Consolidating debugging levels (via Easy Hacks)
Bjoern Michaelsen wrote > .. > Opinions? If there are no objections, I would file Easy Hacks for that. Hi Bjoern, If you create an Easy Hack, perhaps it could be interesting to add with tdf#43157 (see https://bugs.documentfoundation.org/show_bug.cgi?id=43157) in "See Also". Julien -- View this message in context: http://nabble.documentfoundation.org/Consolidating-debugging-levels-via-Easy-Hacks-tp4149516p4149563.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] online.git: 4 commits - loleaflet/build loleaflet/debug loleaflet/dist loleaflet/src
loleaflet/build/deps.js |7 ++
loleaflet/debug/document/document_simple_example.html |1
loleaflet/dist/leaflet.css|9 +++
loleaflet/src/control/Control.EditView.js | 44 ++
loleaflet/src/layer/tile/TileLayer.js | 17 ++
5 files changed, 77 insertions(+), 1 deletion(-)
New commits:
commit bd642c3d370aa4b5507fc28f5eaba819894bc60a
Author: Mihai Varga
Date: Tue May 26 20:56:08 2015 +0300
Make the view/edit text in the control unselectable
diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css
index 1729efb..cd63ccd 100644
--- a/loleaflet/dist/leaflet.css
+++ b/loleaflet/dist/leaflet.css
@@ -295,6 +295,15 @@
font-size: 24px;
}
+/* View / Edit mode control */
+.leaflet-control-editviewswitch {
+ -webkit-touch-callout: none;
+ -webkit-user-select: none;
+ -khtml-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+ }
/* layers control */
commit 22232e070fa11144a1159670aa27ab0211a4fd68
Author: Mihai Varga
Date: Tue May 26 20:51:19 2015 +0300
Dragging will be handled in the js code
diff --git a/loleaflet/debug/document/document_simple_example.html
b/loleaflet/debug/document/document_simple_example.html
index 9bbfd62..9f49456 100644
--- a/loleaflet/debug/document/document_simple_example.html
+++ b/loleaflet/debug/document/document_simple_example.html
@@ -63,7 +63,6 @@
minZoom: 1,
maxZoom: 20,
server: host,
-dragging: false,
doubleClickZoom: false
});
commit 77b8e0d1264179fc98c35ec300cdae5f9ec72f85
Author: Mihai Varga
Date: Tue May 26 20:48:59 2015 +0300
Edit/View switching handler
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index db4f5c7..acbe575 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -63,12 +63,15 @@ L.TileLayer = L.GridLayer.extend({
this._map.socket.send('load url=' + this.options.doc);
this._map.socket.send('status');
}
+ this._map.dragging.disable();
this._map._scrollContainer.onscroll = L.bind(this._onScroll,
this);
this._map.on('zoomend resize', this._updateScrollOffset, this);
this._map.on('clearselection', this._clearSelections, this);
this._map.on('prevpart nextpart', this._onSwitchPart, this);
this._map.on('mousedown mouseup mouseover mouseout mousemove
dblclick',
this._onMouseEvent, this);
+ this._map.on('viewmode editmode', this._updateEditViewMode,
this);
+ this._map.on('drag', this._updateScrollOffset, this);
},
setUrl: function (url, noRedraw) {
@@ -476,6 +479,20 @@ L.TileLayer = L.GridLayer.extend({
}
this._update();
this._pruneTiles();
+ },
+
+ _updateEditViewMode: function (e) {
+ if (e.type === 'viewmode') {
+ this._map.dragging.enable();
+ // disable all user interaction, will need to add
keyboard too
+ this._map.off('mousedown mouseup mouseover mouseout
mousemove dblclick',
+ this._onMouseEvent, this);
+ }
+ else if (e.type === 'editmode') {
+ this._map.dragging.disable();
+ this._map.on('mousedown mouseup mouseover mouseout
mousemove dblclick',
+ this._onMouseEvent, this);
+ }
}
});
commit 7b79f0edd5fd6ed9c0eac158f2f95be1c9094378
Author: Mihai Varga
Date: Tue May 26 20:47:45 2015 +0300
Control for switching between viewing and editing mode
diff --git a/loleaflet/build/deps.js b/loleaflet/build/deps.js
index d1d4fc3..b3e838d 100644
--- a/loleaflet/build/deps.js
+++ b/loleaflet/build/deps.js
@@ -220,6 +220,13 @@ var deps = {
desc: 'Parts control with two buttons (previous / next).'
},
+ ControlEditViewSwitch: {
+ src: ['control/Control.js',
+ 'control/Control.EditView.js'],
+ heading: 'Controls',
+ desc: 'Switches from viewing to editing mode and backwards'
+ },
+
ControlAttrib: {
src: ['control/Control.js',
'control/Control.Attribution.js'],
diff --git a/loleaflet/src/control/Control.EditView.js
b/loleaflet/src/control/Control.EditView.js
new file mode 100644
index 000..248c341
--- /dev/null
+++ b/loleaflet/src/control/Control.EditView.js
@@ -0,0 +1,44 @@
+/*
+ * L.Control.EditView is used for switching between viewing and editing mode
+ */
+
+
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/evoab2/EApi.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 7ed46883290440041d6ccbd7efdb1db64d2dd3f6
Author: Rene Engelhard
Date: Tue May 26 10:47:30 2015 +0200
add libebook-1.2.so.15 in EApi.cxx
Change-Id: I7676f1f69bd563dede965a1a5fc6b1f714f11aab
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx
b/connectivity/source/drivers/evoab2/EApi.cxx
index ea9aeac..1f8d19d 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -21,6 +21,7 @@
#define DECLARE_FN_POINTERS 1
#include "EApi.h"
static const char *eBookLibNames[] = {
+"libebook-1.2.so.15",
"libebook-1.2.so.14", // bumped again (evolution-3.6)
"libebook-1.2.so.13", // bumped again (evolution-3.4)
"libebook-1.2.so.12", // bumped again
___
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' - connectivity/source
connectivity/source/drivers/evoab2/EApi.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit e7659c3e05d517fe399bd2998028b22f1877b236
Author: Rene Engelhard
Date: Tue May 26 10:47:30 2015 +0200
add libebook-1.2.so.15 in EApi.cxx
Change-Id: I7676f1f69bd563dede965a1a5fc6b1f714f11aab
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx
b/connectivity/source/drivers/evoab2/EApi.cxx
index ea9aeac..1f8d19d 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -21,6 +21,7 @@
#define DECLARE_FN_POINTERS 1
#include "EApi.h"
static const char *eBookLibNames[] = {
+"libebook-1.2.so.15",
"libebook-1.2.so.14", // bumped again (evolution-3.6)
"libebook-1.2.so.13", // bumped again (evolution-3.4)
"libebook-1.2.so.12", // bumped again
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Resignation from the ESC
Markus Mohrhard wrote > Hey, > > so I hereby resign from the ESC effective immediately. > ... > I enjoyed working with many great people but I believe that the > project is developing in the wrong direction at the moment and that I > should spend my free time in a better way. Sorry too to read this... Thank you again for your patient help on some bugtrackers, config issues by mailing list/private mail or on IRC. I hope you the best for your next projects. Julien -- View this message in context: http://nabble.documentfoundation.org/Resignation-from-the-ESC-tp4149439p4149565.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: Consolidating debugging levels (via Easy Hacks)
Hi, On Tue, May 26, 2015 at 02:18:11PM +, Juergen Funk Mailinglist wrote: > i think we have 4 levels > - level 0: release build (--enable-release-build) > - level 1: additional debug code, but binary compatible with level 0 (same >library interface, comparable to OSL_DEBUG_LEVEL = 1) > (--enable-symbols) > - level 2: additional debug code, binary incompatible with level 1 and 2 (aka > DBG_UTL) (--enable-dbgutil) > > But i miss the --enable-debug that is between level 1 and 2, it is > incombatible with level 0 and 1 and a little bit near to level 2 (but without > the dgbutil stuff) not quite: --enable-release-build is mostly relevant for Winodws: if not set, it does a dev build, which has different install paths and registry entries. It doesnt change anything about additional debug code. --enable-symbols Doesnt change anything about additional debug code. It just enables creating symbols to allow debugging, but nothing else. --enable-debug Has debug symbols just like --enable-symbols and in addition disables optimizations an inlining and enables assertations. --enable-selective-debuginfo= allows --enable-debug for specific modules. running "make debug=T" or "make gb_DEBUGLEVEL=1": - set the OSL_DEBUG_LEVEL define to 1 and thus enable some additional code - does undefine the OPTIMIZE define and thus disables some optimization - should still be compatible - plus the --enable-debug stuff finally --enable-dbgutil does enable all of the additional "#ifdef DBG_UTIL" stuff. So the only things that really run additional code are debug=T and DBG_UTIL. see also: https://wiki.documentfoundation.org/Development/How_to_debug If there is anything missing/outdated from the wiki-page, feel free to update. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 166e0487c457d639d49e4ac946b3fda9545b47b3 Author: Christian Lohmaier Date: Tue May 26 16:22:25 2015 +0200 Updated core Project: translations bca70bdd09af581293a9176bc68ea92e7cbe3190 update translations for 4.4.4 rc1 Change-Id: I55ad30b94cf5e5f39f02634388e77cd5ec77 diff --git a/translations b/translations index b11e34f..bca70bd 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit b11e34f1d06f02a7f7d17f01ab9a9ea259c90e87 +Subproject commit bca70bdd09af581293a9176bc68ea92e7cbe3190 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-4-4' - source/br source/ca source/da source/de source/dgo source/es source/fr source/gl source/gn source/hu source/it source/ja source/kk so
source/br/librelogo/source/pythonpath.po | 10 source/br/officecfg/registry/data/org/openoffice/Office.po | 10 source/br/officecfg/registry/data/org/openoffice/Office/UI.po | 12 source/br/sc/source/ui/src.po | 30 source/br/scaddins/source/analysis.po | 10 source/br/setup_native/source/mac.po | 11 source/br/svtools/source/misc.po |8 source/br/svtools/uiconfig/ui.po |8 source/br/svx/source/engine3d.po | 22 source/br/svx/source/sidebar/area.po | 14 source/br/svx/source/toolbars.po | 11 source/ca/basctl/source/basicide.po| 10 source/ca/basctl/uiconfig/basicide/ui.po |6 source/ca/chart2/uiconfig/ui.po| 10 source/ca/dbaccess/uiconfig/ui.po | 10 source/ca/formula/source/core/resource.po |4 source/ca/helpcontent2/source/text/sbasic/guide.po | 48 source/ca/helpcontent2/source/text/sbasic/shared.po| 210 source/ca/helpcontent2/source/text/sbasic/shared/01.po | 14 source/ca/helpcontent2/source/text/sbasic/shared/02.po | 20 source/ca/helpcontent2/source/text/scalc/00.po |8 source/ca/helpcontent2/source/text/scalc/01.po | 1693 - source/ca/helpcontent2/source/text/scalc/05.po | 10 source/ca/helpcontent2/source/text/scalc/guide.po | 24 source/ca/helpcontent2/source/text/schart/00.po| 14 source/ca/helpcontent2/source/text/schart/01.po| 105 source/ca/helpcontent2/source/text/sdraw/guide.po |8 source/ca/helpcontent2/source/text/shared/00.po| 42 source/ca/helpcontent2/source/text/shared/01.po| 330 source/ca/helpcontent2/source/text/shared/02.po| 41 source/ca/helpcontent2/source/text/shared/autokorr.po | 10 source/ca/helpcontent2/source/text/shared/autopi.po| 22 source/ca/helpcontent2/source/text/shared/explorer/database.po | 41 source/ca/helpcontent2/source/text/shared/guide.po | 120 source/ca/helpcontent2/source/text/shared/optionen.po | 254 source/ca/helpcontent2/source/text/simpress/01.po | 44 source/ca/helpcontent2/source/text/simpress/02.po |8 source/ca/helpcontent2/source/text/simpress/04.po | 12 source/ca/helpcontent2/source/text/simpress/guide.po | 14 source/ca/helpcontent2/source/text/smath/01.po | 10 source/ca/helpcontent2/source/text/swriter/00.po | 39 source/ca/helpcontent2/source/text/swriter/01.po | 103 source/ca/helpcontent2/source/text/swriter/02.po | 28 source/ca/helpcontent2/source/text/swriter/guide.po| 43 source/ca/helpcontent2/source/text/swriter/librelogo.po| 44 source/ca/officecfg/registry/data/org/openoffice/Office/UI.po | 12 source/ca/sc/source/ui/src.po |6 source/ca/sc/uiconfig/scalc/ui.po | 10 source/da/scp2/source/extensions.po| 18 source/de/cui/uiconfig/ui.po | 14 source/de/extensions/uiconfig/sbibliography/ui.po |6 source/de/helpcontent2/source/text/scalc.po| 16 source/de/helpcontent2/source/text/scalc/00.po |6 source/de/helpcontent2/source/text/scalc/01.po | 20 source/de/helpcontent2/source/text/scalc/04.po |8 source/de/helpcontent2/source/text/scalc/guide.po |8 source/de/helpcontent2/source/text/shared/00.po| 16 source/de/helpcontent2/source/text/shared/01.po| 22 source/de/helpcontent2/source/text/shared/02.po| 14 source/de/helpcontent2/source/text/shared/04.po| 16 source/de/helpcontent2/source/text/shared/explorer/database.po |8 source/de/helpcontent2/source/text/shared/guide.po |8 source/de/helpcontent2/source/text/shared/optionen.po | 10 source/de/helpcontent2/source/text/simpress/01.po |6 source/de/helpcontent2/source/text/simpress/guide.po | 10 source/de/helpcontent2/source/text/smath/00.po
[Libreoffice-commits] core.git: readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 1904 ++-- 1 file changed, 955 insertions(+), 949 deletions(-) New commits: commit d56c1f7a20d8a95c88ea31c7f9000b8e270ab1ee Author: Christian Lohmaier Date: Tue May 26 23:08:05 2015 +0200 update credits Change-Id: I7f5545358a66b0a46dd25e0f6f666366ea3f9709 diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index ac38257..0e53f0e 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,24 +1,24 @@ http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/4.4.3.2$Linux_X86_64 LibreOffice_project/88805f81e9fe61362df02b9941de8e38a9b5fd162012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/4.4.3.2$Linux_X86_64 LibreOffice_project/88805f81e9fe61362df02b9941de8e38a9b5fd162012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 2880 + 739 501 - 21525 - 27942 + 30058 + 9077 true true view2 - 3709 - 3475 + 3676 + 3471 501 - 2880 - 22024 - 30820 + 739 + 30558 + 9814 0 0 false @@ -83,7 +83,7 @@ false 0 - 2733121 + 2811305 false true @@ -302,58 +302,58 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -362,19 +362,19 @@ - + - + - + - + - + @@ -383,24 +383,24 @@ - + - + - + - + - + - + @@ -1008,7 +1008,7 @@ Credits -1056 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2015-05-19 14:32:04. +1058 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2015-05-26 10:47:30. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1035,18 +1035,18 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 - Caolán McNamaraCommits: 17178Joined: 2000-10-10 + Caolán McNamaraCommits: 17219Joined: 2000-10-10 Ivo HinkelmannCommits: 9480Joined: 2002-09-09 - Stephan BergmannCommits: 9118Joined: 2000-10-04 + Stephan BergmannCommits: 9142Joined: 2000-10-04 - Tor LillqvistCommits: 6893Joined: 2010-03-23 + Tor LillqvistCommits: 6907Joined: 2010-03-23
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 1904 ++-- 1 file changed, 955 insertions(+), 949 deletions(-) New commits: commit 1529be9abe061cde231473f6b943180b31dbfc26 Author: Christian Lohmaier Date: Tue May 26 23:13:33 2015 +0200 update credits Change-Id: I8b591a10eb32023f9f526a98c1416f6c47e42800 diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index ac38257..0e53f0e 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,24 +1,24 @@ http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/4.4.3.2$Linux_X86_64 LibreOffice_project/88805f81e9fe61362df02b9941de8e38a9b5fd162012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/4.4.3.2$Linux_X86_64 LibreOffice_project/88805f81e9fe61362df02b9941de8e38a9b5fd162012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 2880 + 739 501 - 21525 - 27942 + 30058 + 9077 true true view2 - 3709 - 3475 + 3676 + 3471 501 - 2880 - 22024 - 30820 + 739 + 30558 + 9814 0 0 false @@ -83,7 +83,7 @@ false 0 - 2733121 + 2811305 false true @@ -302,58 +302,58 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -362,19 +362,19 @@ - + - + - + - + - + @@ -383,24 +383,24 @@ - + - + - + - + - + - + @@ -1008,7 +1008,7 @@ Credits -1056 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2015-05-19 14:32:04. +1058 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2015-05-26 10:47:30. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1035,18 +1035,18 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 - Caolán McNamaraCommits: 17178Joined: 2000-10-10 + Caolán McNamaraCommits: 17219Joined: 2000-10-10 Ivo HinkelmannCommits: 9480Joined: 2002-09-09 - Stephan BergmannCommits: 9118Joined: 2000-10-04 + Stephan BergmannCommits: 9142Joined: 2000-10-04 - Tor LillqvistCommits: 6893Joined: 2010-03-23 + Tor LillqvistCommits: 6907Joined: 2010-03-23
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 2784 ++-- 1 file changed, 1444 insertions(+), 1340 deletions(-) New commits: commit 03f36c0a88d1a87c6febbadca4e549d08c6095b1 Author: Christian Lohmaier Date: Tue May 26 23:18:49 2015 +0200 update credits Change-Id: I5faeceb0d0d3ed16d9c6e4474720c24a8dd95f85 diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index c89e96a..0e53f0e 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,13 +1,13 @@ http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/4.4.2.2$Linux_X86_64 LibreOffice_project/c4c7d32d0d49397cad38d62472b0bc8acff48dd62012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/4.4.3.2$Linux_X86_64 LibreOffice_project/88805f81e9fe61362df02b9941de8e38a9b5fd162012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 660 + 739 501 - 23629 - 15215 + 30058 + 9077 true true @@ -16,9 +16,9 @@ 3676 3471 501 - 660 - 24128 - 15873 + 739 + 30558 + 9814 0 0 false @@ -36,6 +36,7 @@ false false false + true false false false @@ -82,7 +83,7 @@ false 0 - 2684130 + 2811305 false true @@ -131,8 +132,8 @@ - - + + @@ -163,7 +164,7 @@ - + @@ -201,7 +202,7 @@ - + @@ -210,14 +211,14 @@ - + - + @@ -301,23 +302,26 @@ - + - + - + - + - + + + + @@ -379,23 +383,26 @@ - + - + - + - + - + + + + @@ -717,8 +724,7 @@ - - + @@ -1002,7 +1008,7 @@ Credits -1055 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2015-04-28 21:51:10. +1058 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2015-05-26 10:47:30. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1029,18 +1035,18 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 - Caolán McNamaraCommits: 17009Joined: 2000-10-10 + Caolán McNamaraCommits: 17219Joined: 2000-10-10 Ivo HinkelmannCommits: 9480Joined: 2002-09-09 - Stephan BergmannCommits: 8880Joined: 2000-10-04 + Stephan BergmannCommits: 9142Joined: 2000-10-04 - Tor LillqvistCommits: 6862Joined:
Re: Consolidating debugging levels (via Easy Hacks)
My first reaction is that this sounds like an excellent idea. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Consolidating debugging levels (via Easy Hacks)
Bjoern Michaelsen wrote:
> I'd like to propose to consolidate these into _one_ general debug
> level with no funky interaction.
>
Sounds good.
> - Disable all current code that is enabled by OSL_DEBUG_LEVEL > 1 by
^^
should that be 2?
given that:
> - level 2: additional debug code, binary incompatible with level 1
> and 2 (aka DBG_UTL)
>
?
> Everything beyond that should either be "#if 0"'ed or "#ifdef
> DEBUG_${MODULE}_${AREA}".
>
> Opinions? If there are no objections, I would file Easy Hacks for
> that.
>
Splendid, if you meant stuff with level > 2 above.
Cheers,
-- Thorsten
signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/TileLayer.js | 30 ++
1 file changed, 30 insertions(+)
New commits:
commit 8d094fbf3fa051d740be21b2d9772efb0c0a59a3
Author: Henry Castro
Date: Tue May 26 20:37:11 2015 -0400
Added keypress function to send keys
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index acbe575..e082883 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -74,6 +74,25 @@ L.TileLayer = L.GridLayer.extend({
this._map.on('drag', this._updateScrollOffset, this);
},
+ getEvents: function () {
+ var events = {
+ viewreset: this._viewReset,
+ moveend: this._move,
+ keypress: this._onKeyPress
+ };
+
+ if (!this.options.updateWhenIdle) {
+ // update tiles on move, but not more often than once
per given interval
+ events.move = L.Util.throttle(this._move,
this.options.updateInterval, this);
+ }
+
+ if (this._zoomAnimated) {
+ events.zoomanim = this._animateZoom;
+ }
+
+ return events;
+ },
+
setUrl: function (url, noRedraw) {
this._url = url;
@@ -422,6 +441,11 @@ L.TileLayer = L.GridLayer.extend({
' x=' + x + ' y=' + y + ' count=' + count);
},
+ _postKeyboardEvent: function(type, charcode, keycode) {
+ this._map.socket.send('key type=' + type +
+ ' char=' + charcode + ' key=' + keycode);
+ },
+
_onMouseEvent: function (e) {
if (e.type === 'mousedown') {
this._selecting = true;
@@ -493,6 +517,12 @@ L.TileLayer = L.GridLayer.extend({
this._map.on('mousedown mouseup mouseover mouseout
mousemove dblclick',
this._onMouseEvent, this);
}
+ },
+
+ _onKeyPress: function (e) {
+ if (this._cursorMarker) {
+ this._postKeyboardEvent('input',
e.originalEvent.charCode, e.originalEvent.keyCode);
+ }
}
});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/TileLayer.js | 36 +-
1 file changed, 35 insertions(+), 1 deletion(-)
New commits:
commit 9287074b75ddba51d59b6c5227589f21d169
Author: Henry Castro
Date: Tue May 26 20:52:35 2015 -0400
Added cursor visible and invalidate cursor
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index e082883..d43158d 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -52,6 +52,9 @@ L.TileLayer = L.GridLayer.extend({
this.on('tileunload', this._onTileRemove);
}
this._documentInfo = '';
+ this._cursorVisible = false;
+ this._cursorBounds = null;
+ this._cursorMarker = null;
},
_initDocument: function () {
@@ -136,7 +139,22 @@ L.TileLayer = L.GridLayer.extend({
textMsg = String.fromCharCode.apply(null,
bytes.subarray(0, index + 1));
}
- if (textMsg.startsWith('status')) {
+ if (textMsg.startsWith('cursorvisible')) {
+ var command = textMsg.match('cursorvisible: true');
+ this._cursorVisible = command == undefined ? false :
true;
+ this._onUpdateCursor();
+ }
+ else if (textMsg.startsWith('invalidatecursor')) {
+ strTwips = textMsg.match(/\d+/g);
+ var topLeftTwips = new L.Point(parseInt(strTwips[0]),
parseInt(strTwips[1]));
+ var offset = new L.Point(parseInt(strTwips[2]),
parseInt(strTwips[3]));
+ var bottomRightTwips = topLeftTwips.add(offset);
+ this._cursorBounds = new L.LatLngBounds(
+
this._twipsToLatLng(topLeftTwips),
+
this._twipsToLatLng(bottomRightTwips));
+ this._onUpdateCursor();
+ }
+ else if (textMsg.startsWith('status')) {
var command = this._parseServerCmd(textMsg);
if (command.width && command.height &&
this._documentInfo !== textMsg) {
this._docWidthTwips = command.width;
@@ -523,6 +541,22 @@ L.TileLayer = L.GridLayer.extend({
if (this._cursorMarker) {
this._postKeyboardEvent('input',
e.originalEvent.charCode, e.originalEvent.keyCode);
}
+ },
+
+ _onUpdateCursor: function () {
+ if (this._cursorVisible && this._cursorBounds ) {
+ if (this._cursorMarker)
+ this._map.removeLayer(this._cursorMarker);
+
+ var latlngs =
L.rectangle(this._cursorBounds).getLatLngs();
+ // TODO replace for a blinking cursor image.
+ this._cursorMarker =
L.polyline(latlngs.concat([latlngs[0]]));
+ this._map.addLayer(this._cursorMarker);
+ }
+ else {
+ if (this._cursorMarker)
+ this._map.removeLayer(this._cursorMarker);
+ }
}
});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/TileLayer.js | 23 +++
1 file changed, 23 insertions(+)
New commits:
commit 6742cd8046352a3f676bb7a0087135c9c9337150
Author: Henry Castro
Date: Tue May 26 23:51:52 2015 -0400
Capture invalidatetiles when keys are pressed
There is a problem with fade and opacity. they
are set to 0.
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index d43158d..1f2d5ba 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -154,6 +154,29 @@ L.TileLayer = L.GridLayer.extend({
this._twipsToLatLng(bottomRightTwips));
this._onUpdateCursor();
}
+ else if (textMsg.startsWith('invalidatetiles')) {
+ strTwips = textMsg.match(/\d+/g);
+ var topLeftTwips = new L.Point(parseInt(strTwips[0]),
parseInt(strTwips[1]));
+ var offset = new L.Point(parseInt(strTwips[2]),
parseInt(strTwips[3]));
+ var bottomRightTwips = topLeftTwips.add(offset);
+
+ for (var key in this._tiles) {
+ var coords = this._tiles[key].coords;
+ var point1 = this._coordsToTwips(coords);
+ var point2 = new L.Point(point1.x +
this._tileWidthTwips, point1.y + this._tileHeightTwips);
+ var bounds = new L.Bounds(point1, point2);
+ if (bounds.contains(topLeftTwips) ||
bounds.contains(bottomRightTwips)) {
+ this._map.socket.send('tile ' +
+ 'part=' + coords.part + ' ' +
+ 'width=' + this._tileSize + ' '
+
+ 'height=' + this._tileSize + '
' +
+ 'tileposx=' + point1.x + ' '
+
+ 'tileposy=' + point1.y + ' ' +
+ 'tilewidth=' +
this._tileWidthTwips + ' ' +
+ 'tileheight=' +
this._tileHeightTwips);
+ }
+ }
+ }
else if (textMsg.startsWith('status')) {
var command = this._parseServerCmd(textMsg);
if (command.width && command.height &&
this._documentInfo !== textMsg) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Gerrit News for submodules on 2015-05-27
Moin! ~~ Project dictionaries ~~ * Open changes on master for project dictionaries changed in the last 25 hours: + Lightproof: do not return invalid nBehindEndOfSentencePosition in https://gerrit.libreoffice.org/15857 from Németh László * Merged changes on master for project dictionaries changed in the last 25 hours: None * Abandoned changes on master for project dictionaries changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None ~~ Project translations ~~ Nothing moved in the project for the last 25 hours ~~ Project help ~~ Nothing moved in the project for the last 25 hours Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for dev-tools on 2015-05-27
Moin! * Open changes on master for project dev-tools changed in the last 25 hours: None * Merged changes on master for project dev-tools changed in the last 25 hours: + Update master_target to 5.1 series in https://gerrit.libreoffice.org/15872 from Adolfo Jayme Barrientos * Abandoned changes on master for project dev-tools changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2015-05-27
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + Rewrite all calls like Dialog(params).Execute() in https://gerrit.libreoffice.org/15915 from Philippe Jung about module basctl, basic, cui, dbaccess, desktop, extensions, sc, scripting, sd, sfx2, starmath, svtools, svx, sw, vcl + SdImportTest:testCreationDate(): missing :: in https://gerrit.libreoffice.org/15907 from Robert Antoni Buj i Gelonch about module sd End of freshness + tdf#90338 tdf#84254 DrawingML export fix in https://gerrit.libreoffice.org/15918 from Andras Timar about module include, oox, sd + tdf#88276: Add slot and handlers for toolbar|sidebar buttons in https://gerrit.libreoffice.org/15909 from Katarina Behrens about module editeng, include, sd, svx + drop useless field bIsDebug in https://gerrit.libreoffice.org/15911 from Takeshi Abe about module starmath + tdf#88276: Add background colour toolbar and sidebar buttons in https://gerrit.libreoffice.org/15841 from Katarina Behrens about module icon-themes, officecfg, sc, sd, svx + new uno sidebar api in https://gerrit.libreoffice.org/15856 from Laurent Godard about module dbaccess, include, offapi, sfx2, vcl + loplugin:unnecessarysuperclass, merge IWarningsContainer.. in https://gerrit.libreoffice.org/15905 from Noel Grandin about module connectivity, dbaccess, include + convert EXTTEXTINPUT constants to scoped enum in https://gerrit.libreoffice.org/15904 from Noel Grandin about module include, vcl + convert DLGWINDOW constants to scoped enum in https://gerrit.libreoffice.org/15903 from Noel Grandin about module include, vcl + loplugin:unnecessarysuperclass, merge SalInstance with SalGenericInstance in https://gerrit.libreoffice.org/15901 from Noel Grandin about module vcl * Merged changes on master for project core changed in the last 25 hours: + tdf#91416 - fix some incorrectly allocated VirtualDevices. in https://gerrit.libreoffice.org/15913 from Michael Meeks + tdf#91389 EDITING: Crash when deleting header in https://gerrit.libreoffice.org/15908 from Philippe Jung + desktop: simplify code by std::none_of in https://gerrit.libreoffice.org/15837 from Takeshi Abe + Remove B3I64Tuple, it's not used by anything in https://gerrit.libreoffice.org/15811 from Zsolt Bölöny + loplugin:unnecessarysuperclass, merge SmMathConfig with SmConfig in https://gerrit.libreoffice.org/15902 from Noel Grandin + loplugin:unnecessarysuperclass, merge ImageProvider with SaveInData in https://gerrit.libreoffice.org/15900 from Noel Grandin + loplugin:unnecessarysuperclass, merge IThreadListenerOwner with ThreadMan in https://gerrit.libreoffice.org/15899 from Noel Grandin + BASIC: Remove BasicCharClass::IsLetterTab in https://gerrit.libreoffice.org/15876 from Arnaud Versini + loplugin:unnecessarysuperclass, merge IBlockCursor into SwBlockCursor in https://gerrit.libreoffice.org/15898 from Noel Grandin + loplugin: unnecessarysuperclass merge HashedEntryList into NameTranslatio in https://gerrit.libreoffice.org/15897 from Noel Grandin + BASIC: User std::unique_ptr in basic runtime in https://gerrit.libreoffice.org/15874 from Arnaud Versini + kill forgotten, unused TDEBUG token in https://gerrit.libreoffice.org/15893 from Takeshi Abe * Abandoned changes on master for project core changed in the last 25 hours: + DON'T PUSH TO MASTER: Test of buildability after rename-sw-abbreviations. in https://gerrit.libreoffice.org/15718 from Jan Holesovsky + Upgrade firebird to 2.5.3 , a few patches are already applied upstream in https://gerrit.libreoffice.org/15026 from Popa Adrian Marius + loplugin:unnecessarysuperclass merge vcl::unohelper::MutextHelper in https://gerrit.libreoffice.org/15896 from Noel Grandin * Open changes needing tweaks, but being untouched for more than a week: + fdo#58194 - export DOCX Automatic indent as firstLine indent in https://gerrit.libreoffice.org/15768 from Joren De Cuyper + tdf#76334 push viewbox properties to the CustomShapeProperties in https://gerrit.libreoffice.org/15753 from Joren De Cuyper + Add very initial support for Visual Studio 2015 in https://gerrit.libreoffice.org/15644 from Jesús Corrius + tdf#90494: Change gradient angle diagonally by choosing option. in https://gerrit.libreoffice.org/15180 from Heena Gupta + Rendering support for multiStop GradientFill (OOXML LINEAR) in https://gerrit.libreoffice.org/12056 from Vinaya Mandke + Resolves tdf#83365 Other: Access across spreadsheet returns Err:504 in https://gerrit.libreoffice.org/15363 from Henry Castro + tdf#46037: Exchange some uses of configurationhelper for officecfg in Wri in https://gerrit.libreoffice.org/15611 from Marcos Paulo de Souza + tdf#90494-Add new Attribute for exporting gradient angle diagonally in https://gerrit.libreoffice.org/15323 from Heena Gupta + preserve whitespaces here, tdf#88137, tdf#89254 in https://gerrit.libr
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/26092f54865645722aeed596af62d20918aa2046/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
