[Libreoffice-commits] core.git: desktop/source
desktop/source/app/cmdlineargs.cxx |2 --
desktop/source/app/cmdlineargs.hxx |1 -
2 files changed, 3 deletions(-)
New commits:
commit fe842b034fb5f9b3a8444f66cc51f1246ca9
Author: Tor Lillqvist
Date: Sun Aug 11 08:32:06 2013 +0300
m_psn is set but never used
For some reason Clang did not notice and warn about this. I think it
should have been able to, as it is a private field and all code for
this class is in the same source file.
Change-Id: Ib3352695e1d725b768f4e0978a5e9c72715f1021
diff --git a/desktop/source/app/cmdlineargs.cxx
b/desktop/source/app/cmdlineargs.cxx
index ca92a8d..f363f17 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -499,7 +499,6 @@ bool CommandLineArgs::InterpretCommandLineParameter( const
OUString& aArg, OUStr
*/
else if ( aArg.match("-psn") )
{
-m_psn = true;
return true;
}
#endif
@@ -617,7 +616,6 @@ void CommandLineArgs::InitParamValues()
m_helpmath = false;
m_helpimpress = false;
m_helpbase = false;
-m_psn = false;
m_version = false;
m_splashpipe = false;
m_bEmpty = true;
diff --git a/desktop/source/app/cmdlineargs.hxx
b/desktop/source/app/cmdlineargs.hxx
index 6a5bdf1..099bc25 100644
--- a/desktop/source/app/cmdlineargs.hxx
+++ b/desktop/source/app/cmdlineargs.hxx
@@ -144,7 +144,6 @@ class CommandLineArgs: private boost::noncopyable
bool m_helpmath;
bool m_helpimpress;
bool m_helpbase;
-bool m_psn;
bool m_version;
bool m_splashpipe;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/formulacell.hxx|1
sc/inc/sharedformula.hxx |4 +
sc/inc/tokenarray.hxx |3 +
sc/source/core/data/column.cxx| 63 +++---
sc/source/core/data/formulacell.cxx |8 +++
sc/source/core/tool/sharedformula.cxx |5 ++
sc/source/core/tool/token.cxx | 82 ++
7 files changed, 160 insertions(+), 6 deletions(-)
New commits:
commit beb1881c4b82680a63add95dcf6697b38b978c12
Author: Kohei Yoshida
Date: Sat Aug 10 23:31:38 2013 -0400
Collect all boundaries at which to split the formula group.
Change-Id: Ic78d7a06991b983e625b161f11fbbabce02334f3
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 0d258a0..3318dd2 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -336,6 +336,7 @@ public:
bool IsShared() const;
bool IsSharedInvariant() const;
+bool IsSharedTop() const;
SCROW GetSharedTopRow() const;
SCROW GetSharedLength() const;
ScTokenArray* GetSharedCode();
diff --git a/sc/inc/sharedformula.hxx b/sc/inc/sharedformula.hxx
index 232c4bc..9423384 100644
--- a/sc/inc/sharedformula.hxx
+++ b/sc/inc/sharedformula.hxx
@@ -13,6 +13,8 @@
#include "formulacell.hxx"
#include "mtvelements.hxx"
+#include
+
namespace sc {
class SharedFormulaUtil
@@ -61,6 +63,8 @@ public:
*/
static void splitFormulaCellGroup(const CellStoreType::position_type&
aPos);
+static void splitFormulaCellGroups(CellStoreType& rCells, const
std::vector& rBounds);
+
/**
* See if two specified adjacent formula cells can be merged, and if they
* can, merge them into the same group.
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index 09a9798..00f192d 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -166,6 +166,9 @@ public:
sc::RefUpdateResult AdjustReferenceOnMovedTab(
sc::RefUpdateMoveTabContext& rCxt, const ScAddress& rOldPos );
+void CheckRelativeReferenceBounds(
+const sc::RefUpdateContext& rCxt, const ScAddress& rPos, SCROW
nGroupLen, std::vector& rBounds ) const;
+
#if DEBUG_FORMULA_COMPILER
void Dump() const;
#endif
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 0171fab..a395c78 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2295,6 +2295,46 @@ public:
bool isUpdated() const { return mbUpdated; }
};
+class UpdateRefGroupBoundChecker :
std::unary_function
+{
+const sc::RefUpdateContext& mrCxt;
+std::vector& mrBounds;
+public:
+UpdateRefGroupBoundChecker(const sc::RefUpdateContext& rCxt,
std::vector& rBounds) :
+mrCxt(rCxt), mrBounds(rBounds) {}
+
+void operator() (const sc::CellStoreType::value_type& node)
+{
+if (node.type != sc::element_type_formula)
+return;
+
+sc::formula_block::const_iterator it =
sc::formula_block::begin(*node.data);
+sc::formula_block::const_iterator itEnd =
sc::formula_block::end(*node.data);
+
+// Only pick shared formula cells that are the top cells of their
+// respective shared ranges.
+for (; it != itEnd; ++it)
+{
+const ScFormulaCell& rCell = **it;
+if (!rCell.IsShared())
+continue;
+
+if (rCell.IsSharedTop())
+{
+// Check its tokens and record its reference boundaries.
+const ScTokenArray& rCode = *rCell.GetCode();
+rCode.CheckRelativeReferenceBounds(
+mrCxt, rCell.aPos, rCell.GetSharedLength(), mrBounds);
+
+// Move to the last cell in the group, to get incremented to
+// the next cell in the next iteration.
+size_t nOffsetToLast = rCell.GetSharedLength() - 1;
+std::advance(it, nOffsetToLast);
+}
+}
+}
+};
+
}
bool ScColumn::UpdateReferenceOnCopy( const sc::RefUpdateContext& rCxt,
ScDocument* pUndoDoc )
@@ -2324,6 +2364,8 @@ bool ScColumn::UpdateReference( const
sc::RefUpdateContext& rCxt, ScDocument* pU
if (rCxt.meMode == URM_COPY)
return UpdateReferenceOnCopy(rCxt, pUndoDoc);
+std::vector aBounds;
+
bool bThisColShifted = (rCxt.maRange.aStart.Tab() <= nTab && nTab <=
rCxt.maRange.aEnd.Tab() &&
rCxt.maRange.aStart.Col() <= nCol && nCol <=
rCxt.maRange.aEnd.Col());
if (bThisColShifted)
@@ -2333,17 +2375,26 @@ bool ScColumn::UpdateReference( const
sc::RefUpdateContext& rCxt, ScDocument* pU
SCROW nSplitPos = rCxt.maRange.aStart.Row();
if (ValidRow(nSplitPos))
{
-sc::CellStoreType::position_type aPos =
maCells.position(nSplitPos);
-sc::SharedFormulaUtil::splitFormulaCellGroup(aPos);
+aBounds.push_back(nSplitPos);
nSplitPos = rCxt.maRange.aEnd.Row() + 1;
if
[Libreoffice-commits] core.git: i18nutil/source
i18nutil/source/utility/casefolding_data.h |4 ++--
i18nutil/source/utility/paper.cxx |2 +-
i18nutil/source/utility/unicode_data.h | 14 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit b47e653209729665cd1cf426ee6141705a2376a7
Author: Takeshi Abe
Date: Sun Aug 11 08:01:51 2013 +0900
Mark as const
Change-Id: I220204cc5ebec15402ae175aef110abad8b00267
diff --git a/i18nutil/source/utility/casefolding_data.h
b/i18nutil/source/utility/casefolding_data.h
index 0b50083..c41e8ba 100644
--- a/i18nutil/source/utility/casefolding_data.h
+++ b/i18nutil/source/utility/casefolding_data.h
@@ -23,7 +23,7 @@
namespace com { namespace sun { namespace star { namespace i18n {
-static sal_Int8 CaseMappingIndex[] = {
+static const sal_Int8 CaseMappingIndex[] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, -1, -1, // - 07ff
-1, -1, -1, -1, -1, -1, -1, -1, // 0800 - 0fff
-1, -1, -1, -1, -1, -1, -1, -1, // 1000 - 17ff
@@ -59,7 +59,7 @@ static sal_Int8 CaseMappingIndex[] = {
};
-static Value CaseMappingValue[] = {
+static const Value CaseMappingValue[] = {
{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00,
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // - 0007
{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00,
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 0008 - 000f
{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00,
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 0010 - 0017
diff --git a/i18nutil/source/utility/paper.cxx
b/i18nutil/source/utility/paper.cxx
index 372990b..1a6c725 100644
--- a/i18nutil/source/utility/paper.cxx
+++ b/i18nutil/source/utility/paper.cxx
@@ -61,7 +61,7 @@ struct PageDesc
//http://partners.adobe.com/public/developer/en/ps/5003.PPD_Spec_v4.3.pdf
//http://www.y-adagio.com/public/committees/docsii/doc_00-49/symp_ulaan/china_ppr.pdf
(Kai)
//http://www.sls.psi.ch/controls/help/howto/Howto_Print_a_A0_Poster_at_WSLA_012_2.pdf
(Dia)
-static PageDesc aDinTab[] =
+static const PageDesc aDinTab[] =
{
{ MM2MM100( 841 ), MM2MM100( 1189 ), "A0", NULL },
{ MM2MM100( 594 ), MM2MM100( 841 ),"A1", NULL },
diff --git a/i18nutil/source/utility/unicode_data.h
b/i18nutil/source/utility/unicode_data.h
index 231125c..e7a192f 100644
--- a/i18nutil/source/utility/unicode_data.h
+++ b/i18nutil/source/utility/unicode_data.h
@@ -25,7 +25,7 @@
#define UnicodeTypeNumberBlock 5
-static sal_Int8 UnicodeTypeIndex[] = {
+static const sal_Int8 UnicodeTypeIndex[] = {
0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, // - 07ff
0x00, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, // 0800 - 0fff
0x14, 0x15, 0x16, 0x17, 0x18, 0x01, 0x19, 0x1a, // 1000 - 17ff
@@ -61,12 +61,12 @@ static sal_Int8 UnicodeTypeIndex[] = {
};
-static sal_Int8 UnicodeTypeBlockValue[] = {
+static const sal_Int8 UnicodeTypeBlockValue[] = {
0, 5, 17, 18, 27,
};
-static sal_Int8 UnicodeTypeValue[] = {
+static const sal_Int8 UnicodeTypeValue[] = {
15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,// - 000f
15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,// 0010 - 001f
12,23,23,23,25,23,23,23,20,21,23,24,23,19,23,23,// 0020 - 002f
@@ -905,7 +905,7 @@ static sal_Int8 UnicodeTypeValue[] = {
#define UnicodeDirectionNumberBlock 3
-static sal_Int8 UnicodeDirectionIndex[] = {
+static const sal_Int8 UnicodeDirectionIndex[] = {
0x03, 0x00, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, // - 07ff
0x00, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, // 0800 - 0fff
0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x13, // 1000 - 17ff
@@ -941,12 +941,12 @@ static sal_Int8 UnicodeDirectionIndex[] = {
};
-static sal_Int8 UnicodeDirectionBlockValue[] = {
+static const sal_Int8 UnicodeDirectionBlockValue[] = {
0, 10, 13,
};
-static sal_Int8 UnicodeDirectionValue[] = {
+static const sal_Int8 UnicodeDirectionValue[] = {
18,18,18,18,18,18,18,18,18, 8, 7, 8, 9, 7,18,18,// - 000f
18,18,18,18,18,18,18,18,18,18,18,18, 7, 7, 7, 8,// 0010 - 001f
9,10,10, 4, 4, 4,10,10,10,10,10, 4, 6, 4, 6, 3,// 0020 - 002f
@@ -1548,7 +1548,7 @@ static sal_Int8 UnicodeDirectionValue[] = {
#define UnicodeScriptTypeFrom0
#define UnicodeScriptTypeTo 1
-static sal_Unicode UnicodeScriptType[][2] = {
+static const sal_Unicode UnicodeScriptType[][2] = {
{0x, 0x007f}, // 0. Basic Latin
{0x0080, 0x00ff}, // 1. Latin-1 Supplement
{0x0100, 0x017f}, // 2. Latin Extended-A
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/dbui/mmaddressblockpage.cxx | 35 ---
1 file changed, 14 insertions(+), 21 deletions(-)
New commits:
commit 32447330e6b62a2e886a5758fc35e844a7f5f28f
Author: Matteo Casalin
Date: Sat Aug 10 23:25:07 2013 +0200
String/XubString to OUString
Change-Id: I0b36d16375ef9ecc751bed1171ea2ecd0c524744
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx
b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 4734070..a060bc0 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -616,7 +616,7 @@
SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(
const ResStringArray& rHeaders = m_rConfigItem.GetDefaultAddressHeaders();
for(sal_uInt16 i = 0; i < rHeaders.Count(); ++i)
{
-const XubString& rHeader = rHeaders.GetString( i );
+const OUString rHeader = rHeaders.GetString( i );
SvTreeListEntry* pEntry = m_aAddressElementsLB.InsertEntry(rHeader);
pEntry->SetUserData((void*)(sal_IntPtr)i);
}
@@ -1026,11 +1026,9 @@ SwAssignFieldsControl::SwAssignFieldsControl(
//fill the controls
for(sal_uInt16 i = 0; i < rHeaders.Count(); ++i)
{
-const XubString& rHeader = rHeaders.GetString( i );
+const OUString rHeader = rHeaders.GetString( i );
FixedInfo* pNewText = new FixedInfo(&m_aWindow, ResId( FT_FIELDS,
*rResId.GetResMgr()));
-String sLabel(OUString("<>"));
-sLabel.Insert(rHeader, 1);
-pNewText->SetText(sLabel);
+pNewText->SetText("<" + rHeader + ">");
ListBox* pNewLB = new ListBox(&m_aWindow, ResId(LB_FIELDS,
*rResId.GetResMgr()));
pNewLB->SetHelpId( aHIDs[i] );
pNewLB->SelectEntryPos(0);
@@ -1179,7 +1177,7 @@ IMPL_LINK(SwAssignFieldsControl, ScrollHdl_Impl,
ScrollBar*, pScroll)
IMPL_LINK(SwAssignFieldsControl, MatchHdl_Impl, ListBox*, pBox)
{
-String sColumn = pBox->GetSelectEntry();
+const OUString sColumn = pBox->GetSelectEntry();
uno::Reference< XColumnsSupplier > xColsSupp(
m_rConfigItem.GetResultSet(), uno::UNO_QUERY);
uno::Reference xColAccess = xColsSupp.is() ?
xColsSupp->getColumns() : 0;
OUString sPreview;
@@ -1255,14 +1253,14 @@ SwAssignFieldsDialog::SwAssignFieldsDialog(
m_rConfigItem(rConfigItem)
{
//resize the HeaderBar
-String sAddressElement( SW_RES(ST_ADDRESSELEMENT ));
-String sMatchesTo( SW_RES(ST_MATCHESTO ));
-String sPreview( SW_RES(ST_PREVIEW));
+OUString sAddressElement( SW_RESSTR(ST_ADDRESSELEMENT) );
+const OUString sMatchesTo( SW_RESSTR(ST_MATCHESTO) );
+const OUString sPreview( SW_RESSTR(ST_PREVIEW) );
if(!bIsAddressBlock)
{
-m_aPreviewFI.SetText(String(SW_RES(ST_SALUTATIONPREVIEW)));
-m_aMatchingFI.SetText(String(SW_RES(ST_SALUTATIONMATCHING)));
-sAddressElement = String(SW_RES(ST_SALUTATIONELEMENT));
+m_aPreviewFI.SetText(SW_RESSTR(ST_SALUTATIONPREVIEW));
+m_aMatchingFI.SetText(SW_RESSTR(ST_SALUTATIONMATCHING));
+sAddressElement = SW_RESSTR(ST_SALUTATIONELEMENT);
}
FreeResource();
Size aOutputSize(m_pFieldsControl->m_aHeaderHB.GetSizePixel());
@@ -1276,9 +1274,7 @@ SwAssignFieldsDialog::SwAssignFieldsDialog(
m_pFieldsControl->SetModifyHdl(LINK(this, SwAssignFieldsDialog,
AssignmentModifyHdl_Impl ));
-String sMatching = m_aMatchingFI.GetText();
-sMatching.SearchAndReplaceAscii("%1", sMatchesTo);
-m_aMatchingFI.SetText(sMatching);
+m_aMatchingFI.SetText(m_aMatchingFI.GetText().replaceAll("%1",
sMatchesTo));
m_aOK.SetClickHdl(LINK(this, SwAssignFieldsDialog, OkHdl_Impl));
}
@@ -1299,11 +1295,8 @@ uno::Sequence< OUString >
SwAssignFieldsDialog::CreateAssignments()
aLBIter != m_pFieldsControl->m_aMatches.end();
++aLBIter, ++nIndex)
{
-String sSelect = (*aLBIter)->GetSelectEntry();
-if(m_sNone != sSelect)
-pAssignments[nIndex] = sSelect;
-else
-pAssignments[nIndex] = OUString();
+const OUString sSelect = (*aLBIter)->GetSelectEntry();
+pAssignments[nIndex] = (m_sNone != sSelect) ? sSelect : OUString();
}
return aAssignments;
}
@@ -1320,7 +1313,7 @@ IMPL_LINK_NOARG(SwAssignFieldsDialog, OkHdl_Impl)
IMPL_LINK_NOARG(SwAssignFieldsDialog, AssignmentModifyHdl_Impl)
{
uno::Sequence< OUString > aAssignments = CreateAssignments();
-String sPreview = SwAddressPreview::FillData(
+const OUString sPreview = SwAddressPreview::FillData(
m_rPreviewString, m_rConfigItem, &aAssignments);
m_aPreviewWIN.SetAddress(sPreview);
return 0;
___
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/doc/notxtfrm.cxx | 15 ---
1 file changed, 15 deletions(-)
New commits:
commit a2b4ebdf3a3fb305de76080d9b4ffbbebd1a3118
Author: Philipp Riemer
Date: Sat Aug 10 22:00:39 2013 +0200
delete dead code
The pJobSetup is never used since the relevant method call is commented out.
Therefore, not only the variable itself but also the bDummyJobSetup parts
can
be removed here.
This code came from a merge with the AOO code base and is like this
since 2005 (see commit 750562b47054741cdd4516affe9741908ee45c11).
Change-Id: I19eec322b05634b4b6f3604bf1da57dfc390af4e
Reviewed-on: https://gerrit.libreoffice.org/5343
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 222962d..e3be834 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -1051,18 +1051,6 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const
SwRect &rGrfArea ) cons
Point aPosition(aAlignedGrfArea.Pos());
Size aSize(aAlignedGrfArea.SSize());
-// Im BrowseModus gibt es nicht unbedingt einen Drucker und
-// damit kein JobSetup, also legen wir eines an ...
-const JobSetup* pJobSetup =
pOLENd->getIDocumentDeviceAccess()->getJobsetup();
-sal_Bool bDummyJobSetup = 0 == pJobSetup;
-if( bDummyJobSetup )
-pJobSetup = new JobSetup();
-
-// #i42323#
-// The reason for #114233# is gone, so i remove it again
-//TODO/LATER: is it a problem that the JobSetup isn't used?
-//xRef->DoDraw( pOut, aAlignedGrfArea.Pos(),
aAlignedGrfArea.SSize(), *pJobSetup );
-
const Graphic* pGraphic = pOLENd->GetGraphic();
if ( pGraphic && pGraphic->GetType() != GRAPHIC_NONE )
{
@@ -1078,9 +1066,6 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const
SwRect &rGrfArea ) cons
else
::svt::EmbeddedObjectRef::DrawPaintReplacement( Rectangle(
aPosition, aSize ), pOLENd->GetOLEObj().GetCurrentPersistName(), pOut );
-if( bDummyJobSetup )
-delete pJobSetup;
-
sal_Int64 nMiscStatus =
pOLENd->GetOLEObj().GetOleRef()->getStatus( pOLENd->GetAspect() );
if ( !bPrn && pShell->ISA( SwCrsrShell ) &&
nMiscStatus &
embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - include/tools include/vcl tools/source unusedcode.easy vcl/source
include/tools/string.hxx |4 ++--
include/vcl/button.hxx |1 -
tools/source/string/strimp.cxx | 16
tools/source/string/tustring.cxx | 11 ---
unusedcode.easy |1 -
vcl/source/control/button.cxx| 12
vcl/source/control/combobox.cxx |8
vcl/source/control/morebtn.cxx |2 --
vcl/source/window/btndlg.cxx |1 -
9 files changed, 6 insertions(+), 50 deletions(-)
New commits:
commit 9891cb881b68d643bcae6160e2284be4728a3612
Author: Caolán McNamara
Date: Sat Aug 10 12:30:11 2013 +0100
Related: fdo#38838 remove String::Equals(const sal_Unicode* ...)
Change-Id: I6eeede3261e7b6f5ad81a4d2fa9ecc6c07002dbb
diff --git a/include/tools/string.hxx b/include/tools/string.hxx
index e185480..9de7baa 100644
--- a/include/tools/string.hxx
+++ b/include/tools/string.hxx
@@ -134,6 +134,8 @@ private:
TOOLS_DLLPRIVATE UniString( sal_Unicode c );
TOOLS_DLLPRIVATE UniString& Assign( const sal_Unicode* pCharStr,
xub_StrLen nLen );
TOOLS_DLLPRIVATE UniString& Expand( xub_StrLen nCount, sal_Unicode
cExpandChar );
+TOOLS_DLLPRIVATE sal_Bool Equals( const sal_Unicode* pCharStr,
+xub_StrLen nIndex, xub_StrLen nLen ) const;
public:
UniString();
UniString( const ResId& rResId );
@@ -242,8 +244,6 @@ public:
sal_BoolEqualsIgnoreCaseAscii( const sal_Char* pAsciiStr )
const;
sal_BoolEquals( const UniString& rStr,
xub_StrLen nIndex, xub_StrLen nLen ) const;
-sal_BoolEquals( const sal_Unicode* pCharStr,
-xub_StrLen nIndex, xub_StrLen nLen ) const;
sal_BoolEqualsAscii( const sal_Char* pAsciiStr,
xub_StrLen nIndex, xub_StrLen nLen )
const;
sal_BoolEqualsIgnoreCaseAscii( const UniString& rStr,
diff --git a/tools/source/string/strimp.cxx b/tools/source/string/strimp.cxx
index 3c47dab..6fbb280 100644
--- a/tools/source/string/strimp.cxx
+++ b/tools/source/string/strimp.cxx
@@ -17,22 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-static sal_Int32 ImplStringCompare( const STRCODE* pStr1, const STRCODE* pStr2,
-xub_StrLen nCount )
-{
-sal_Int32 nRet = 0;
-while ( nCount &&
-((nRet =
((sal_Int32)((STRCODEU)*pStr1))-((sal_Int32)((STRCODEU)*pStr2))) == 0) &&
-*pStr2 )
-{
-++pStr1,
-++pStr2,
---nCount;
-}
-
-return nRet;
-}
-
static sal_Int32 ImplStringCompareWithoutZero( const STRCODE* pStr1, const
STRCODE* pStr2,
sal_Int32 nCount )
{
diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx
index ac4bb4a..4d3d8c7 100644
--- a/tools/source/string/tustring.cxx
+++ b/tools/source/string/tustring.cxx
@@ -412,17 +412,6 @@ sal_Bool STRING::Equals( const STRING& rStr, xub_StrLen
nIndex, xub_StrLen nLen
return (ImplStringCompareWithoutZero( mpData->maStr+nIndex,
rStr.mpData->maStr, nLen ) == 0);
}
-sal_Bool STRING::Equals( const STRCODE* pCharStr, xub_StrLen nIndex,
xub_StrLen nLen ) const
-{
-DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-
-// Are there enough codes for comparing?
-if ( nIndex > mpData->mnLen )
-return (*pCharStr == 0);
-
-return (ImplStringCompare( mpData->maStr+nIndex, pCharStr, nLen ) == 0);
-}
-
xub_StrLen STRING::Match( const STRING& rStr ) const
{
DBG_CHKTHIS( STRING, DBGCHECKSTRING );
diff --git a/unusedcode.easy b/unusedcode.easy
index 07246c1c..30b8cd9 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -75,7 +75,6 @@ SmFontPickList::Contains(Font const&) const
StatusBar::CopyItems(StatusBar const&)
StatusBar::HideItems()
StatusBar::ShowItems()
-String::Equals(unsigned short const*, unsigned short, unsigned short) const
SvFileStream::GetFileHandle() const
SvdProgressInfo::ReportError()
SvpSalInstance::PostEvent(SalFrame const*, void*, unsigned short)
commit ce6b095ce310c1bd6c9b3120497a3af511186d2b
Author: Caolán McNamara
Date: Sat Aug 10 12:36:04 2013 +0100
Button::GetStandardHelpText returns empty string, its all a noop
Change-Id: I651b19840aabf67b3083cd855c2851ac4c96741e
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index fae8240..4869d1c 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -72,7 +72,6 @@ public:
const Link& GetClickHdl() const { return maClickHdl; }
static OUString GetStandardText( StandardButtonType eButton );
-static XubStringGetStandardHelpText( StandardButtonType eButton );
sal_BoolSetModeImage( const Image& rImage );
const Image GetModeImage( ) const;
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.
[Libreoffice-commits] core.git: xmlhelp/source
xmlhelp/source/cxxhelp/provider/content.cxx | 46
xmlhelp/source/cxxhelp/provider/content.hxx |9
xmlhelp/source/cxxhelp/provider/contentcaps.cxx |9
xmlhelp/source/cxxhelp/provider/databases.cxx | 34 -
xmlhelp/source/cxxhelp/provider/databases.hxx | 30 ---
xmlhelp/source/cxxhelp/provider/provider.cxx| 30 ---
xmlhelp/source/cxxhelp/provider/provider.hxx| 12 --
xmlhelp/source/cxxhelp/provider/resultset.cxx | 15 ---
xmlhelp/source/cxxhelp/provider/services.cxx|5 --
xmlhelp/source/treeview/tvfactory.cxx | 35 --
xmlhelp/source/treeview/tvread.cxx | 14 ---
xmlhelp/source/treeview/tvread.hxx | 26 -
12 files changed, 265 deletions(-)
New commits:
commit 2f66b0cb110c2f7d864f96e850015aa1741e1f94
Author: Jelle van der Waa
Date: Sat Aug 10 19:28:48 2013 +0200
fdo#62475 removed pointless comments
Change-Id: I4fa01553246fa023806b3fec8e6e756a1efa59f1
Reviewed-on: https://gerrit.libreoffice.org/5342
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx
b/xmlhelp/source/cxxhelp/provider/content.cxx
index 04837f2..7a84493 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
/**
TODO
**
@@ -52,13 +51,7 @@
using namespace com::sun::star;
using namespace chelp;
-//=
-//=
-//
// Content Implementation.
-//
-//=
-//=
Content::Content( const uno::Reference< uno::XComponentContext >& rxContext,
::ucbhelper::ContentProviderImplHelper* pProvider,
@@ -71,17 +64,12 @@ Content::Content( const uno::Reference<
uno::XComponentContext >& rxContext,
{
}
-//=
// virtual
Content::~Content()
{
}
-//=
-//
// XInterface methods.
-//
-//=
// virtual
void SAL_CALL Content::acquire()
@@ -90,7 +78,6 @@ void SAL_CALL Content::acquire()
ContentImplHelper::acquire();
}
-//=
// virtual
void SAL_CALL Content::release()
throw( )
@@ -98,7 +85,6 @@ void SAL_CALL Content::release()
ContentImplHelper::release();
}
-//=
// virtual
uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType )
throw ( uno::RuntimeException )
@@ -107,15 +93,10 @@ uno::Any SAL_CALL Content::queryInterface( const uno::Type
& rType )
return aRet.hasValue() ? aRet : ContentImplHelper::queryInterface( rType
);
}
-//=
-//
// XTypeProvider methods.
-//
-//=
XTYPEPROVIDER_COMMON_IMPL( Content );
-//=
// virtual
uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
throw( uno::RuntimeException )
@@ -145,11 +126,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
return (*pCollection).getTypes();
}
-//=
-//
// XServiceInfo methods.
-//
-//=
// virtual
OUString SAL_CALL Content::getImplementationName()
@@ -158,7 +135,6 @@ OUString SAL_CALL Content::getImplementationName()
return OUString( "CHelpContent" );
}
-//=
// virtual
uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
throw( uno::RuntimeException )
@@ -169,11 +145,7 @@ uno::Sequence< OUString > SAL_CALL
Content::getSupportedServiceNames()
return aSNS;
}
-//=
-//
// XContent methods.
-//
-//=
// virtual
OUString SAL_CALL Content::getContentType()
@@ -182,11 +154,7 @@ OUString SAL_CALL Content::getContentType()
return OUString( MY
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 tommy27 changed: What|Removed |Added Depends on||54933 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 tommy27 changed: What|Removed |Added Depends on|54933 | -- 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: sd/source
sd/source/ui/view/DocumentRenderer.cxx| 49 +---
sd/source/ui/view/GraphicObjectBar.cxx|6 -
sd/source/ui/view/MediaObjectBar.cxx |2
sd/source/ui/view/Outliner.cxx| 25 +++---
sd/source/ui/view/ViewClipboard.cxx | 14 +--
sd/source/ui/view/ViewShellBase.cxx |2
sd/source/ui/view/ViewShellImplementation.cxx | 14 +--
sd/source/ui/view/drbezob.cxx |2
sd/source/ui/view/drtxtob.cxx |2
sd/source/ui/view/drtxtob1.cxx|4 -
sd/source/ui/view/drviews1.cxx| 32
sd/source/ui/view/drviews2.cxx| 100 --
12 files changed, 122 insertions(+), 130 deletions(-)
New commits:
commit d4ba5995a168a8999734252fe6e9240bde1b7dae
Author: Ivan Timofeev
Date: Sat Aug 10 21:37:06 2013 +0400
String->OUString
Change-Id: Ic908590642bac656db78a965c2176d6f53c8d6f4
diff --git a/sd/source/ui/view/DocumentRenderer.cxx
b/sd/source/ui/view/DocumentRenderer.cxx
index a277534..51b0a45 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -194,10 +194,7 @@ namespace {
OUString GetPrinterSelection (sal_Int32 nPageCount, sal_Int32
nCurrentPageIndex) const
{
sal_Int32 nContent =
static_cast(mrProperties.getIntValue( "PrintContent", 0 ));
-OUString sFullRange = OUStringBuffer()
- .append(static_cast(1))
- .append(static_cast('-'))
- .append(nPageCount).makeStringAndClear();
+OUString sFullRange = "1-" + OUString::number(nPageCount);
if (nContent == 0) // all pages/slides
{
@@ -404,9 +401,9 @@ namespace {
maProperties.push_back(aOptionsUIFile);
SvtModuleOptions aOpt;
-String aAppGroupname( String( SdResId(
_STR_IMPRESS_PRINT_UI_GROUP_NAME ) ) );
-aAppGroupname.SearchAndReplace( String( "%s" ),
- aOpt.GetModuleName( mbImpress ?
SvtModuleOptions::E_SIMPRESS : SvtModuleOptions::E_SDRAW ) );
+OUString
aAppGroupname(SD_RESSTR(_STR_IMPRESS_PRINT_UI_GROUP_NAME));
+aAppGroupname = aAppGroupname.replaceFirst("%s",
aOpt.GetModuleName(
+mbImpress ? SvtModuleOptions::E_SIMPRESS :
SvtModuleOptions::E_SDRAW));
AddDialogControl(vcl::PrinterOptionsHelper::setGroupControlOpt("tabcontrol-page2",
aAppGroupname, ".HelpID:vcl:PrintDialog:TabPage:AppPage"));
uno::Sequence< OUString > aHelpIds, aWidgetIds;
@@ -415,7 +412,7 @@ namespace {
vcl::PrinterOptionsHelper::UIControlOptions aPrintOpt;
aPrintOpt.maGroupHint = "JobPage" ;
AddDialogControl(
vcl::PrinterOptionsHelper::setSubgroupControlOpt("extraimpressprintoptions",
-String(
SdResId(_STR_IMPRESS_PRINT_UI_PRINT_GROUP) ),
+
SD_RESSTR(_STR_IMPRESS_PRINT_UI_PRINT_GROUP),
"",
aPrintOpt ));
@@ -423,7 +420,7 @@ namespace {
aHelpIds[0] =
".HelpID:vcl:PrintDialog:PageContentType:ListBox" ;
AddDialogControl(
vcl::PrinterOptionsHelper::setChoiceListControlOpt(
"impressdocument",
-String( SdResId(
_STR_IMPRESS_PRINT_UI_CONTENT ) ),
+SD_RESSTR(_STR_IMPRESS_PRINT_UI_CONTENT),
aHelpIds,
"PageContentType" ,
CreateChoice(_STR_IMPRESS_PRINT_UI_CONTENT_CHOICES),
@@ -434,7 +431,7 @@ namespace {
vcl::PrinterOptionsHelper::UIControlOptions aContentOpt(
"PageContentType" , 1 );
AddDialogControl(
vcl::PrinterOptionsHelper::setChoiceListControlOpt(
"slidesperpage",
-String( SdResId(
_STR_IMPRESS_PRINT_UI_SLIDESPERPAGE ) ),
+
SD_RESSTR(_STR_IMPRESS_PRINT_UI_SLIDESPERPAGE),
aHelpIds,
"SlidesPerPage" ,
GetSlidesPerPageSequence(),
@@ -448,7 +445,7 @@ namespace {
vcl::PrinterOptionsHelper::UIControlOptions aSlidesPerPageOpt(
"SlidesPerPage" , -1, sal_True );
AddDialogControl(
vcl::PrinterOptionsHelper::setChoiceListControlOpt(
"slidesperpageorder",
-String( SdResId(
_STR_IMPRESS_PRINT_UI_ORDER ) ),
+SD_RESSTR(_STR_IMPRESS_PRINT_UI_ORDER),
aHelpIds,
"Sl
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/wrtw8nds.cxx | 47 --
1 file changed, 21 insertions(+), 26 deletions(-)
New commits:
commit 8cb156a67b987981efbda3640e503d601c40d88b
Author: Matteo Casalin
Date: Fri Aug 9 23:13:43 2013 +0200
String to OUString an some code simplification
Change-Id: Ibbc2d6a6ea9fd9e53f7c391171b7d2787873ce76
Reviewed-on: https://gerrit.libreoffice.org/5340
Reviewed-by: Matteo Casalin
Tested-by: Matteo Casalin
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index 001b220..ce78a87 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -104,47 +104,44 @@ using namespace sw::types;
using namespace sw::mark;
using namespace nsFieldFlags;
-static String lcl_getFieldCode( const IFieldmark* pFieldmark ) {
+static OUString lcl_getFieldCode( const IFieldmark* pFieldmark )
+{
OSL_ENSURE(pFieldmark!=NULL, "where is my fieldmark???");
-if ( !pFieldmark) {
-return String();
-} else if ( pFieldmark->GetFieldname( ) == ODF_FORMTEXT ) {
+if ( !pFieldmark)
+return OUString();
+if ( pFieldmark->GetFieldname( ) == ODF_FORMTEXT )
return OUString(" FORMTEXT ");
-} else if ( pFieldmark->GetFieldname( ) == ODF_FORMDROPDOWN ) {
+if ( pFieldmark->GetFieldname( ) == ODF_FORMDROPDOWN )
return OUString(" FORMDROPDOWN ");
-} else if ( pFieldmark->GetFieldname( ) == ODF_FORMCHECKBOX ) {
+if ( pFieldmark->GetFieldname( ) == ODF_FORMCHECKBOX )
return OUString(" FORMCHECKBOX ");
-} else if ( pFieldmark->GetFieldname( ) == ODF_TOC ) {
+if ( pFieldmark->GetFieldname( ) == ODF_TOC )
return OUString(" TOC ");
-} else if ( pFieldmark->GetFieldname( ) == ODF_HYPERLINK ) {
+if ( pFieldmark->GetFieldname( ) == ODF_HYPERLINK )
return OUString(" HYPERLINK ");
-} else if ( pFieldmark->GetFieldname( ) == ODF_PAGEREF ) {
+if ( pFieldmark->GetFieldname( ) == ODF_PAGEREF )
return OUString(" PAGEREF ");
-} else {
-return pFieldmark->GetFieldname();
-}
+return pFieldmark->GetFieldname();
}
static ww::eField lcl_getFieldId( const IFieldmark* pFieldmark ) {
OSL_ENSURE(pFieldmark!=NULL, "where is my fieldmark???");
-if ( !pFieldmark ) {
+if ( !pFieldmark )
return ww::eUNKNOWN;
-} else if ( pFieldmark->GetFieldname( ) == ODF_FORMTEXT ) {
+if ( pFieldmark->GetFieldname( ) == ODF_FORMTEXT )
return ww::eFORMTEXT;
-} else if ( pFieldmark->GetFieldname( ) == ODF_FORMDROPDOWN ) {
+if ( pFieldmark->GetFieldname( ) == ODF_FORMDROPDOWN )
return ww::eFORMDROPDOWN;
-} else if ( pFieldmark->GetFieldname( ) == ODF_FORMCHECKBOX ) {
+if ( pFieldmark->GetFieldname( ) == ODF_FORMCHECKBOX )
return ww::eFORMCHECKBOX;
-} else if ( pFieldmark->GetFieldname( ) == ODF_TOC ) {
+if ( pFieldmark->GetFieldname( ) == ODF_TOC )
return ww::eTOC;
-} else if ( pFieldmark->GetFieldname( ) == ODF_HYPERLINK ) {
+if ( pFieldmark->GetFieldname( ) == ODF_HYPERLINK )
return ww::eHYPERLINK;
-} else if ( pFieldmark->GetFieldname( ) == ODF_PAGEREF ) {
+if ( pFieldmark->GetFieldname( ) == ODF_PAGEREF )
return ww::ePAGEREF;
-} else {
-return ww::eUNKNOWN;
-}
+return ww::eUNKNOWN;
}
MSWordAttrIter::MSWordAttrIter( MSWordExportBase& rExport )
@@ -1842,7 +1839,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode&
rNode )
if ( pFieldmark && pFieldmark->GetFieldname() == ODF_FORMTEXT )
AppendBookmark( pFieldmark->GetName(), false );
ww::eField eFieldId = lcl_getFieldId( pFieldmark );
-String sCode = lcl_getFieldCode( pFieldmark );
+OUString sCode = lcl_getFieldCode( pFieldmark );
if ( pFieldmark && pFieldmark->GetFieldname() == ODF_UNHANDLED
)
{
IFieldmark::parameter_map_t::const_iterator it =
pFieldmark->GetParameters()->find( ODF_ID_PARAM );
@@ -1856,9 +1853,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode&
rNode )
it = pFieldmark->GetParameters()->find( ODF_CODE_PARAM );
if ( it != pFieldmark->GetParameters()->end() )
{
-OUString sOUCode;
-it->second >>= sOUCode;
-sCode = sOUCode;
+it->second >>= sCode;
}
}
___
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/doc/doctxm.cxx |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) New commits: commit 0b6ad716d1fbae7523359fdaf1d6a716eae9a891 Author: Matteo Casalin Date: Fri Aug 9 23:15:28 2013 +0200 Remove redundant conditions Change-Id: Ieff61755865b90d0c470b6257ac3d5aae1543397 Reviewed-on: https://gerrit.libreoffice.org/5341 Reviewed-by: Matteo Casalin Tested-by: Matteo Casalin diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index aa3b58c..1ad2b0e 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -257,8 +257,7 @@ const SwTOXMark& SwDoc::GotoTOXMark( const SwTOXMark& rCurTOXMark, break; /* no break here */ case TOX_PRV: -if ( (aAbsNew < aAbsIdx && aAbsNew > aPrevPos && - aPrevPos != aAbsIdx && aAbsNew != aAbsIdx ) || +if ( (aAbsNew < aAbsIdx && aAbsNew > aPrevPos) || (aAbsIdx == aAbsNew && (sal_uLong(&rCurTOXMark) > sal_uLong(pTOXMark) && (!pNew || @@ -282,8 +281,7 @@ const SwTOXMark& SwDoc::GotoTOXMark( const SwTOXMark& rCurTOXMark, break; /* no break here */ case TOX_NXT: -if ( (aAbsNew > aAbsIdx && aAbsNew < aNextPos && - aNextPos != aAbsIdx && aAbsNew != aAbsIdx ) || +if ( (aAbsNew > aAbsIdx && aAbsNew < aNextPos) || (aAbsIdx == aAbsNew && (sal_uLong(&rCurTOXMark) < sal_uLong(pTOXMark) && (!pNew || ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/recentdocsview.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 5c892638821b9e63a768047bee24fd52494de0c3 Author: Julien Nabet Date: Sat Aug 10 17:15:04 2013 +0200 fdo#46037: 1 less comphelper/configurationhelper in sfx2 Change-Id: I48c99ab6ac9b26a5772a320ca2526c636a49208d diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index a1654a5..fc119af 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -19,7 +19,6 @@ #include -#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: forms/source
forms/source/xforms/convert.cxx|7 ++-
forms/source/xforms/model_ui.cxx | 29 -
forms/source/xforms/submission.cxx |9 ++---
3 files changed, 12 insertions(+), 33 deletions(-)
New commits:
commit 6cd939111aaf32a35ffe4eb893115e91df2eb664
Author: Neil Moore
Date: Fri Aug 9 12:29:54 2013 -0400
BUG:57950 Remove chained appends
Removed some chained OUString::append()'s from forms. OUStringBuffer
could really use a append operator(+=).
Change-Id: I635bdd25da9f09373e686d87a1d198bc09bda906
Reviewed-on: https://gerrit.libreoffice.org/5329
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx
index 651ecc1..4bdfe21 100644
--- a/forms/source/xforms/convert.cxx
+++ b/forms/source/xforms/convert.cxx
@@ -386,11 +386,8 @@ namespace
aDateTime.Minutes, aDateTime.Hours, aDateTime.IsUTC);
OUString sTime = lcl_toXSD_UNOTime_typed( aTime );
-OUStringBuffer sInfo;
-sInfo.append( sDate );
-sInfo.append( (sal_Unicode) 'T' );
-sInfo.append( sTime );
-return sInfo.makeStringAndClear();
+OUString sRet = sDate + "T" + sTime;
+return sRet;
}
//
diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx
index 4dec45b..e4b07df 100644
--- a/forms/source/xforms/model_ui.cxx
+++ b/forms/source/xforms/model_ui.cxx
@@ -300,9 +300,7 @@ OUString Model::getNodeDisplayName( const XNode_t& xNode,
OUString sContent = xNode->getNodeValue();
if( bDetail || ! lcl_isWhitespace( sContent ) )
{
-aBuffer.append( sal_Unicode('"') );
-aBuffer.append( Convert::collapseWhitespace( sContent ) );
-aBuffer.append( sal_Unicode('"') );
+aBuffer = aBuffer + "\"" + Convert::collapseWhitespace(
sContent ) + "\"";
}
}
break;
@@ -360,18 +358,15 @@ OUString Model::getBindingName( const XPropertySet_t&
xBinding,
OUString sExpression;
xBinding->getPropertyValue( "BindingExpression" ) >>= sExpression;
-OUStringBuffer aBuffer;
+OUString sRet;
if( !sID.isEmpty() )
{
-aBuffer.append( sID );
-aBuffer.append( " (" );
-aBuffer.append( sExpression );
-aBuffer.append( ")" );
+sRet = sID + " (" + sExpression + ") ";
}
else
-aBuffer.append( sExpression );
+sRet = sExpression;
-return aBuffer.makeStringAndClear();
+return sRet;
}
OUString Model::getSubmissionName( const XPropertySet_t& xSubmission,
@@ -766,18 +761,12 @@ static OUString lcl_serializeForDisplay( const Reference<
XAttr >& _rxAttrNode )
OSL_ENSURE( _rxAttrNode.is(), "lcl_serializeForDisplay( attr ): invalid
argument!" );
if ( _rxAttrNode.is() )
{
-OUStringBuffer aBuffer;
-aBuffer.append( _rxAttrNode->getName() );
-aBuffer.appendAscii( "=" );
OUString sValue = _rxAttrNode->getValue();
sal_Unicode nQuote = '"';
if ( sValue.indexOf( nQuote ) >= 0 )
nQuote = '\'';
-aBuffer.append( nQuote );
-aBuffer.append( sValue );
-aBuffer.append( nQuote );
-aBuffer.append( (sal_Unicode)' ' );
-sResult = aBuffer.makeStringAndClear();
+
+sResult = _rxAttrNode->getName() + "=" + OUString(nQuote) + sValue +
OUString(nQuote) + " ";
}
return sResult;
}
@@ -884,9 +873,7 @@ static OUString lcl_serializeForDisplay( const
Reference& xResult
break;
case XPathObjectType_XPATH_STRING:
-aBuffer.append( sal_Unicode('"') );
-aBuffer.append( xResult->getString() );
-aBuffer.append( sal_Unicode('"') );
+aBuffer = aBuffer + "\"" + xResult->getString() + "\"";
break;
case XPathObjectType_XPATH_NODESET:
diff --git a/forms/source/xforms/submission.cxx
b/forms/source/xforms/submission.cxx
index cc4f53c..873b6c1 100644
--- a/forms/source/xforms/submission.cxx
+++ b/forms/source/xforms/submission.cxx
@@ -478,13 +478,8 @@ sal_Int64 SAL_CALL Submission::getSomething(
static OUString lcl_message( const OUString& rID, const OUString& rText )
{
-OUStringBuffer aMessage;
-aMessage.append( "XForms submission '" );
-aMessage.append( rID );
-aMessage.append( "' failed" );
-aMessage.append( rText );
-aMessage.append( "." );
-return aMessage.makeStringAndClear();
+OUString aMessage = "XForms submission '" + rID + "' failed" + rText + ".";
+return aMessage;
}
void SAL_CALL Submission::submitWithInteraction(
___
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/items/flditem.cxx |7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
New commits:
commit 9ffa46f008cf650955c6894f065fde02b647d717
Author: Neil Moore
Date: Fri Aug 9 02:02:34 2013 -0400
Removed chained appends in SvxAuthorField, as part of Bug 57950.
Change-Id: Id23139b9bdd7897178a013d7dc9e39a670e3d4da
Reviewed-on: https://gerrit.libreoffice.org/5324
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index bc67903..58aeb95 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -1127,12 +1127,7 @@ OUString SvxAuthorField::GetFormatted() const
switch( eFormat )
{
case SVXAUTHORFORMAT_FULLNAME:
-{
-OUStringBuffer aBuf(aFirstName);
-aBuf.append(sal_Unicode(' '));
-aBuf.append(aName);
-aString = aBuf.makeStringAndClear();
-}
+aString = aFirstName + " " + aName;
break;
case SVXAUTHORFORMAT_NAME:
aString = aName;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/ui/envelp/labelcfg.cxx |9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 7d8ab35f1f4a069d08b57652f79870fdcfc649af
Author: Matúš Kukan
Date: Sat Aug 10 12:57:52 2013 +0200
fdo#67799 read ending item also when assert is noop
Change-Id: I056212d0a01f7a647e846bbd1b605c04e1798a14
Reviewed-on: https://gerrit.libreoffice.org/5336
Tested-by: Norbert Thiebaud
Reviewed-by: Norbert Thiebaud
diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx
index dc815c7..f24f440 100644
--- a/sw/source/ui/envelp/labelcfg.cxx
+++ b/sw/source/ui/envelp/labelcfg.cxx
@@ -33,14 +33,11 @@ using namespace ::com::sun::star::beans;
static inline void lcl_assertEndingItem(xmlreader::XmlReader& reader)
{
-#if OSL_DEBUG_LEVEL > 0
int nsId;
xmlreader::Span name;
-assert(reader.nextItem(xmlreader::XmlReader::TEXT_NONE, &name, &nsId)
-== xmlreader::XmlReader::RESULT_END);
-#else
-(void)reader;
-#endif
+xmlreader::XmlReader::Result res;
+res = reader.nextItem(xmlreader::XmlReader::TEXT_NONE, &name, &nsId);
+assert(res == xmlreader::XmlReader::RESULT_END);
}
static inline OUString lcl_getValue(xmlreader::XmlReader& reader,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source
sc/source/ui/docshell/docfunc.cxx |4 1 file changed, 4 insertions(+) New commits: commit 100ba6a1a52925ac5042c3efb25c8376fd128ff7 Author: Eike Rathke Date: Fri Aug 9 20:02:08 2013 +0200 resolved fdo#66205 call PostPaintCell() in Set...Cell() data entry Cell modifications need to chain repaint positions. Regression introduced with bcf5b54b47eda4e39b4f5f4813cb43e1f52f0201 and related. Change-Id: I4df633304443ea761ae743ee1271f5777e0da5b2 (cherry picked from commit bc599dca8b6b46cff35dab01ad26c18ea529b261) Reviewed-on: https://gerrit.libreoffice.org/5332 Reviewed-by: Norbert Thiebaud Tested-by: Norbert Thiebaud diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 6e8cd1c..1144c0e 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -833,6 +833,7 @@ bool ScDocFunc::SetValueCell( const ScAddress& rPos, double fVal, bool bInteract if (bHeight) AdjustRowHeight(rPos); +rDocShell.PostPaintCell( rPos ); aModificator.SetDocumentModified(); // #103934#; notify editline and cell in edit mode @@ -869,6 +870,7 @@ bool ScDocFunc::SetStringCell( const ScAddress& rPos, const OUString& rStr, bool if (bHeight) AdjustRowHeight(rPos); +rDocShell.PostPaintCell( rPos ); aModificator.SetDocumentModified(); // #103934#; notify editline and cell in edit mode @@ -903,6 +905,7 @@ bool ScDocFunc::SetEditCell( const ScAddress& rPos, const EditTextObject& rStr, if (bHeight) AdjustRowHeight(rPos); +rDocShell.PostPaintCell( rPos ); aModificator.SetDocumentModified(); // #103934#; notify editline and cell in edit mode @@ -956,6 +959,7 @@ bool ScDocFunc::SetFormulaCell( const ScAddress& rPos, ScFormulaCell* pCell, boo if (bHeight) AdjustRowHeight(rPos); +rDocShell.PostPaintCell( rPos ); aModificator.SetDocumentModified(); // #103934#; notify editline and cell in edit mode ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source
svx/source/items/algitem.cxx |8
svx/source/xoutdev/xattr.cxx |6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit a4a938f1ac9eea09e2fc7dd53d5c7e2d7ad1ddc2
Author: Caolán McNamara
Date: Fri Aug 9 15:14:26 2013 +0100
metric strings loaded from wrong .src
Change-Id: I5261a699a44bc7eb6ecca1842f2390a0778d7b09
(cherry picked from commit e3cf54875031b8740b3ed76d6f530c44d2d8c44e)
Reviewed-on: https://gerrit.libreoffice.org/5335
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index e0b0aa0..1451fdb 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -266,19 +266,19 @@ SfxItemPresentation SvxMarginItem::GetPresentation
{
rText = SVX_RESSTR(RID_SVXITEMS_MARGIN_LEFT) +
GetMetricText( (long)nLeftMargin, eCoreUnit,
ePresUnit, pIntl ) +
-SVX_RESSTR(GetMetricId(ePresUnit)) +
+EE_RESSTR(GetMetricId(ePresUnit)) +
cpDelimTmp +
SVX_RESSTR(RID_SVXITEMS_MARGIN_TOP) +
GetMetricText( (long)nTopMargin, eCoreUnit, ePresUnit,
pIntl ) +
-SVX_RESSTR(GetMetricId(ePresUnit)) +
+EE_RESSTR(GetMetricId(ePresUnit)) +
cpDelimTmp +
SVX_RESSTR(RID_SVXITEMS_MARGIN_RIGHT) +
GetMetricText( (long)nRightMargin, eCoreUnit,
ePresUnit, pIntl ) +
-SVX_RESSTR(GetMetricId(ePresUnit)) +
+EE_RESSTR(GetMetricId(ePresUnit)) +
cpDelimTmp +
SVX_RESSTR(RID_SVXITEMS_MARGIN_BOTTOM) +
GetMetricText( (long)nBottomMargin, eCoreUnit,
ePresUnit, pIntl ) +
-SVX_RESSTR(GetMetricId(ePresUnit));
+EE_RESSTR(GetMetricId(ePresUnit));
return SFX_ITEM_PRESENTATION_COMPLETE;
}
default: ; //prevent warning
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 540941f..b687590 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -1317,7 +1317,7 @@ SfxItemPresentation XLineWidthItem::GetPresentation
case SFX_ITEM_PRESENTATION_COMPLETE:
rText = GetMetricText( (long) GetValue(),
eCoreUnit, ePresUnit, pIntl) +
-SVX_RESSTR( GetMetricId( ePresUnit) );
+EE_RESSTR( GetMetricId( ePresUnit) );
return ePres;
default:
return SFX_ITEM_PRESENTATION_NONE;
@@ -2462,7 +2462,7 @@ SfxItemPresentation XLineStartWidthItem::GetPresentation
case SFX_ITEM_PRESENTATION_COMPLETE:
rText = GetMetricText( (long) GetValue(),
eCoreUnit, ePresUnit, pIntl) +
-SVX_RESSTR( GetMetricId( ePresUnit) );
+EE_RESSTR( GetMetricId( ePresUnit) );
return ePres;
default:
return SFX_ITEM_PRESENTATION_NONE;
@@ -2553,7 +2553,7 @@ SfxItemPresentation XLineEndWidthItem::GetPresentation
case SFX_ITEM_PRESENTATION_COMPLETE:
rText = GetMetricText( (long) GetValue(),
eCoreUnit, ePresUnit, pIntl) +
-SVX_RESSTR( GetMetricId( ePresUnit) );
+EE_RESSTR( GetMetricId( ePresUnit) );
return ePres;
default:
return SFX_ITEM_PRESENTATION_NONE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/aqua
vcl/aqua/source/a11y/aqua11yfocuslistener.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ddba6389b685d4f839da350d0ea42e6aebf67b70
Author: Boris Dušek
Date: Fri Aug 2 00:36:54 2013 +0200
Revert "fdo#54320: VoiceOver does not follow keyboard focus"
The code was correct (and docs confusing). The code did not work because
67410 was not fixed at that moment. With 67410 fixed, the code works
as it was originally.
Also in the meantime I discovered a comment in the NSAccessibility.h header
telling that NSAccessibilityPostNotification should be passed the newly
focused
element and that the function itself will make sure to post the notification
on the NSApp element instead.
This reverts commit e9257fa0e642de2f1c79f2c80387334010812dab.
Change-Id: I7f76ebde963cf57879273d9848ff195877759524
Reviewed-on: https://gerrit.libreoffice.org/5280
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
index ace2616..5a0c339 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
+++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
@@ -83,7 +83,7 @@ AquaA11yFocusListener::focusedObjectChanged(const Reference<
XAccessible >& xAcc
if( xContext.is() )
{
m_focusedObject = [ AquaA11yFactory
wrapperForAccessibleContext: xContext ];
-NSAccessibilityPostNotification(NSApp,
NSAccessibilityFocusedUIElementChangedNotification);
+NSAccessibilityPostNotification(m_focusedObject,
NSAccessibilityFocusedUIElementChangedNotification);
}
}
} catch(const RuntimeException &) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/aqua
vcl/aqua/source/a11y/aqua11yfactory.mm | 27 +++
1 file changed, 27 insertions(+)
New commits:
commit 86499a56c2a746bcbde8a7f6b278b0b5ef84ce86
Author: Boris Dušek
Date: Wed Jul 31 00:08:46 2013 +0200
fdo#67410: VoiceOver does not provide typing or cursor movement echo in text
Change-Id: Ief39aecd247b612c52cd970b6c5911f34d8cb69e
Reviewed-on: https://gerrit.libreoffice.org/5208
Reviewed-by: LuboÅ¡ LuÅák
Tested-by: LuboÅ¡ LuÅák
Reviewed-on: https://gerrit.libreoffice.org/5279
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/vcl/aqua/source/a11y/aqua11yfactory.mm
b/vcl/aqua/source/a11y/aqua11yfactory.mm
index 222fb6c..64f1783 100644
--- a/vcl/aqua/source/a11y/aqua11yfactory.mm
+++ b/vcl/aqua/source/a11y/aqua11yfactory.mm
@@ -155,6 +155,30 @@ static bool enabled = false;
#endif
{
[ dAllWrapper setObject: aWrapper forKey: nKey ];
+/* fdo#67410: Accessibility notifications are not delivered on
NSView subclasses that do not
+ "reasonably" participate in NSView hierarchy (perhaps the only
important point is
+ that the view is a transitive subview of the NSWindow's content
view, but I
+ did not try to verify that).
+
+ So let the superview-subviews relationship mirror the
AXParent-AXChildren relationship.
+*/
+id parent = [aWrapper
accessibilityAttributeValue:NSAccessibilityParentAttribute];
+if (parent) {
+if ([parent isKindOfClass:[NSView class]]) {
+// SAL_DEBUG("Wrapper INIT: " << [[aWrapper description]
UTF8String] << " ==> " << [[parent description] UTF8String]);
+NSView *parentView = (NSView *)parent;
+[parentView addSubview:aWrapper positioned:NSWindowBelow
relativeTo:nil];
+} else if ([parent
isKindOfClass:NSClassFromString(@"SalFrameWindow")]) {
+NSWindow *window = (NSWindow *)parent;
+NSView *salView = [window contentView];
+// SAL_DEBUG("Wrapper INIT SAL: " << [[aWrapper
description] UTF8String] << " ==> " << [[salView description] UTF8String]);
+[salView addSubview:aWrapper positioned:NSWindowBelow
relativeTo:nil];
+} else {
+// SAL_DEBUG("Wrapper INIT: !! " << [[aWrapper
description] UTF8String] << " !==>! " << [[parent description] UTF8String] <<
"!!");
+}
+} else {
+// SAL_DEBUG("Wrapper INIT: " << [[aWrapper description]
UTF8String] << " ==> NO PARENT");
+}
}
}
return aWrapper;
@@ -169,6 +193,9 @@ static bool enabled = false;
// TODO: when RADIO_BUTTON search for associated RadioGroup-wrapper and
delete that as well
AquaA11yWrapper * theWrapper = [ AquaA11yFactory
wrapperForAccessibleContext: rxAccessibleContext createIfNotExists: NO ];
if ( theWrapper != nil ) {
+if (![theWrapper isKindOfClass:NSClassFromString(@"SalFrameView")]) {
+[theWrapper removeFromSuperview];
+}
[ [ AquaA11yFactory allWrapper ] removeObjectForKey: [ AquaA11yFactory
keyForAccessibleContext: rxAccessibleContext ] ];
[ theWrapper release ];
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/aqua
vcl/aqua/source/a11y/aqua11ytextwrapper.mm |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9c8831244062202e9066b97be7082e72e1194866
Author: Boris Dušek
Date: Fri Aug 9 08:41:42 2013 +0200
fdo#67680: Impossible to search for text attributes with VoiceOver
Change-Id: I02ae12233aa37830106eeffd16876670413f4627
Reviewed-on: https://gerrit.libreoffice.org/5334
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
b/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
index 4d4b75c..ab02eaf 100644
--- a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
@@ -108,13 +108,13 @@ using namespace ::rtl;
+(id)sharedTextUIElementsAttributeForElement:(AquaA11yWrapper *)wrapper
{
(void)wrapper;
-return [ [ NSArray alloc ] init ]; // unsupported
+return [NSArray arrayWithObject:wrapper];
}
+(id)sharedCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper
{
(void)wrapper;
-return [ NSValue valueWithRange: NSMakeRange ( 0, 0 ) ]; // unsupported
+return [ NSValue valueWithRange: NSMakeRange ( 0, [wrapper
accessibleText]->getCharacterCount() ) ];
}
+(void)addAttributeNamesTo:(NSMutableArray *)attributeNames {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/aqua
vcl/aqua/source/a11y/aqua11ywrapper.mm | 33 +
1 file changed, 13 insertions(+), 20 deletions(-)
New commits:
commit cbf695c68d31853d0746950e6dff1d5e27ec35c1
Author: Boris Dušek
Date: Thu Aug 8 00:30:24 2013 +0200
Transform left SAL_DEBUG output to SAL_INFO
Change-Id: Ic3528a8a349ec8e6929ceed8c5e3ec8d2a6232c1
Reviewed-on: https://gerrit.libreoffice.org/5333
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm
b/vcl/aqua/source/a11y/aqua11ywrapper.mm
index 47ca292..bb0d81b 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm
@@ -58,9 +58,6 @@ using namespace ::com::sun::star::uno;
static BOOL isPopupMenuOpen = NO;
-
-#if 0
-
static std::ostream &operator<<(std::ostream &s, NSObject *obj) {
return s << [[obj description] UTF8String];
}
@@ -68,11 +65,7 @@ static std::ostream &operator<<(std::ostream &s, NSObject
*obj) {
static std::ostream &operator<<(std::ostream &s, NSPoint point) {
return s << NSStringFromPoint(point);
}
-#define AX_SAL_DEBUG(...) SAL_DEBUG(__VA_ARGS__)
-#else
-#define AX_SAL_DEBUG(...)
-#endif
@implementation AquaA11yWrapper : NSView
@@ -684,7 +677,7 @@ static std::ostream &operator<<(std::ostream &s, NSPoint
point) {
#pragma mark Accessibility Protocol
-(id)accessibilityAttributeValue:(NSString *)attribute {
-AX_SAL_DEBUG("[" << self << " accessibilityAttributeValue:" << attribute
<< "]");
+SAL_INFO("vcl.a11y", "[" << self << " accessibilityAttributeValue:" <<
attribute << "]");
// #i90575# guard NSAccessibility protocol against unwanted access
if ( isPopupMenuOpen ) {
return nil;
@@ -714,7 +707,7 @@ static std::ostream &operator<<(std::ostream &s, NSPoint
point) {
}
-(BOOL)accessibilityIsIgnored {
-AX_SAL_DEBUG("[" << self << " accessibilityIsIgnored]");
+SAL_INFO("vcl.a11y", "[" << self << " accessibilityIsIgnored]");
// #i90575# guard NSAccessibility protocol against unwanted access
if ( isPopupMenuOpen ) {
return NO;
@@ -738,7 +731,7 @@ static std::ostream &operator<<(std::ostream &s, NSPoint
point) {
}
-(NSArray *)accessibilityAttributeNames {
-AX_SAL_DEBUG("[" << self << " accessibilityAttributeNames]");
+SAL_INFO("vcl.a11y", "[" << self << " accessibilityAttributeNames]");
// #i90575# guard NSAccessibility protocol against unwanted access
if ( isPopupMenuOpen ) {
return nil;
@@ -819,7 +812,7 @@ static std::ostream &operator<<(std::ostream &s, NSPoint
point) {
}
-(BOOL)accessibilityIsAttributeSettable:(NSString *)attribute {
-AX_SAL_DEBUG("[" << self << " accessibilityAttributeIsSettable:" <<
attribute << "]");
+SAL_INFO("vcl.a11y", "[" << self << " accessibilityAttributeIsSettable:"
<< attribute << "]");
BOOL isSettable = NO;
if ( [ self accessibleText ] != nil ) {
isSettable = [ AquaA11yTextWrapper isAttributeSettable: attribute
forElement: self ];
@@ -837,7 +830,7 @@ static std::ostream &operator<<(std::ostream &s, NSPoint
point) {
}
-(NSArray *)accessibilityParameterizedAttributeNames {
-AX_SAL_DEBUG("[" << self << " accessibilityParameterizedAttributeNames]");
+SAL_INFO("vcl.a11y", "[" << self << "
accessibilityParameterizedAttributeNames]");
NSMutableArray * attributeNames = [ [ NSMutableArray alloc ] init ];
// Special Attributes depending on interface
if ( [ self accessibleText ] != nil ) {
@@ -847,7 +840,7 @@ static std::ostream &operator<<(std::ostream &s, NSPoint
point) {
}
-(id)accessibilityAttributeValue:(NSString *)attribute
forParameter:(id)parameter {
-AX_SAL_DEBUG("[" << self << " accessibilityAttributeValue:" << attribute
<< " forParameter:" << parameter << "]");
+SAL_INFO("vcl.a11y", "[" << self << " accessibilityAttributeValue:" <<
attribute << " forParameter:" << parameter << "]");
SEL methodSelector = [ self selectorForAttribute: attribute asGetter: YES
withGetterParameter: YES ];
if ( [ self respondsToSelector: methodSelector ] ) {
return [ self performSelector: methodSelector withObject: parameter ];
@@ -857,14 +850,14 @@ static std::ostream &operator<<(std::ostream &s, NSPoint
point) {
-(BOOL)accessibilitySetOverrideValue:(id)value forAttribute:(NSString
*)attribute
{
-AX_SAL_DEBUG("[" << self << " accessibilitySetOverrideValue:" << value <<
" forAttribute:" << attribute << "]");
+SAL_INFO("vcl.a11y", "[" << self << " accessibilitySetOverrideValue:" <<
value << " forAttribute:" << attribute << "]");
(void)value;
(void)attribute;
return NO; // TODO
}
-(void)accessibilitySetValue:(id)value forAttribute:(NSString *)attribute {
-AX_SAL_DEBUG("[" << self << " accessibilitySetValue:" << value << "
forAttribute:" << attribute << "]");
+SAL_INFO("vcl.a11y", "[" << self << " accessibilitySetValue:" << value <<
" forAttribute:" << att
[Libreoffice-commits] core.git: unotools/Library_utl.mk unotools/source
unotools/Library_utl.mk|4 ++
unotools/source/config/saveopt.cxx | 59 ++---
2 files changed, 14 insertions(+), 49 deletions(-)
New commits:
commit 203951880a4a61b7569eb5878efc8aa5d7ff8652
Author: Julien Nabet
Date: Sat Aug 10 16:22:00 2013 +0200
fdo#46037: 1 less occurrence comphelper/configurationhelper in unotools
Change-Id: If188eecd0f5ea3802ec795866d21c41e643cbd63
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index e364811..2f14d75 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -13,6 +13,10 @@ $(eval $(call gb_Library_Library,utl))
$(eval $(call gb_Library_use_external,utl,boost_headers))
+$(eval $(call gb_Library_use_custom_headers,utl,\
+ officecfg/registry \
+))
+
# in case UNO services are exported: declare location of component file
$(eval $(call gb_Library_set_componentfile,utl,unotools/util/utl))
diff --git a/unotools/source/config/saveopt.cxx
b/unotools/source/config/saveopt.cxx
index 6ff1252..a58439b 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -26,9 +26,9 @@
#include
#include
-#include
#include
#include "itemholder1.hxx"
+#include
using namespace utl;
using namespace com::sun::star::uno;
@@ -564,30 +564,9 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
}
}
-try
-{
-css::uno::Reference< css::uno::XInterface > xCFG =
::comphelper::ConfigurationHelper::openConfig(
-::comphelper::getProcessComponentContext(),
-OUString("org.openoffice.Office.Recovery"),
-::comphelper::ConfigurationHelper::E_READONLY);
-
-::comphelper::ConfigurationHelper::readRelativeKey(
-xCFG,
-OUString("AutoSave"),
-OUString("Enabled")) >>= bAutoSave;
-
-::comphelper::ConfigurationHelper::readRelativeKey(
-xCFG,
-OUString("AutoSave"),
-OUString("TimeIntervall")) >>= nAutoSaveTime;
-
-::comphelper::ConfigurationHelper::readRelativeKey(
-xCFG,
-OUString("AutoSave"),
-OUString("UserAutoSaveEnabled")) >>= bUserAutoSave;
-}
-catch(const css::uno::Exception&)
-{ OSL_FAIL("Could not find needed information for AutoSave feature.");
}
+bAutoSave = officecfg::Office::Recovery::AutoSave::Enabled::get();
+nAutoSaveTime =
officecfg::Office::Recovery::AutoSave::TimeIntervall::get();
+bUserAutoSave =
officecfg::Office::Recovery::AutoSave::UserAutoSaveEnabled::get();
}
SvtSaveOptions_Impl::~SvtSaveOptions_Impl()
@@ -758,30 +737,12 @@ void SvtSaveOptions_Impl::Commit()
aValues.realloc(nRealCount);
PutProperties( aNames, aValues );
-css::uno::Reference< css::uno::XInterface > xCFG =
::comphelper::ConfigurationHelper::openConfig(
-::comphelper::getProcessComponentContext(),
-OUString("org.openoffice.Office.Recovery"),
-::comphelper::ConfigurationHelper::E_STANDARD);
-
-::comphelper::ConfigurationHelper::writeRelativeKey(
-xCFG,
-OUString("AutoSave"),
-OUString("TimeIntervall"),
-css::uno::makeAny(nAutoSaveTime));
-
-::comphelper::ConfigurationHelper::writeRelativeKey(
-xCFG,
-OUString("AutoSave"),
-OUString("Enabled"),
-css::uno::makeAny(bAutoSave));
-
-::comphelper::ConfigurationHelper::writeRelativeKey(
-xCFG,
-OUString("AutoSave"),
-OUString("UserAutoSaveEnabled"),
-css::uno::makeAny(bUserAutoSave));
-
-::comphelper::ConfigurationHelper::flush(xCFG);
+boost::shared_ptr< comphelper::ConfigurationChanges > batch(
+comphelper::ConfigurationChanges::create());
+officecfg::Office::Recovery::AutoSave::TimeIntervall::set(nAutoSaveTime,
batch);
+officecfg::Office::Recovery::AutoSave::Enabled::set(bAutoSave, batch);
+
officecfg::Office::Recovery::AutoSave::UserAutoSaveEnabled::set(bUserAutoSave,
batch);
+batch->commit();
}
// ---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/vcl unusedcode.easy vcl/source
include/vcl/bmpacc.hxx|1 -
unusedcode.easy |1 -
vcl/source/filter/sgvtext.cxx | 15 +--
vcl/source/gdi/bmpacc3.cxx| 42 --
4 files changed, 5 insertions(+), 54 deletions(-)
New commits:
commit 651a252374d67716afedebb2a5eae76243da8e3b
Author: Julien Nabet
Date: Sat Aug 10 15:38:31 2013 +0200
Remove unused BitmapWriteAccess::FillPolygon
Change-Id: Iba583b4efab88620b54b02626bc9d9396219d0c8
diff --git a/include/vcl/bmpacc.hxx b/include/vcl/bmpacc.hxx
index a57377d..ea36a05 100644
--- a/include/vcl/bmpacc.hxx
+++ b/include/vcl/bmpacc.hxx
@@ -195,7 +195,6 @@ public:
voidFillRect( const Rectangle& rRect );
voidDrawRect( const Rectangle& rRect );
-voidFillPolygon( const Polygon& rPoly );
voidFillPolyPolygon( const PolyPolygon& rPoly );
private:
diff --git a/unusedcode.easy b/unusedcode.easy
index 2b35769..07246c1c 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -5,7 +5,6 @@
(anonymous namespace)::VBATest::testMiscOLEStuff()
AffineMatrixItem::GetAffineMatrix2D() const
BitmapWriteAccess::FillPolyPolygon(PolyPolygon const&)
-BitmapWriteAccess::FillPolygon(Polygon const&)
CuiAboutConfigTabPage::LinkStubHeaderSelect_Impl(void*, void*)
DbgRegisterNamedUserChannel(rtl::OUString const&, void (*)(char const*))
EditTextObjectImpl::SetParaAttribs(int, SfxItemSet const&)
diff --git a/vcl/source/gdi/bmpacc3.cxx b/vcl/source/gdi/bmpacc3.cxx
index 6523967..06c9c09 100644
--- a/vcl/source/gdi/bmpacc3.cxx
+++ b/vcl/source/gdi/bmpacc3.cxx
@@ -243,48 +243,6 @@ void BitmapWriteAccess::DrawRect( const Rectangle& rRect )
}
}
-// --
-
-void BitmapWriteAccess::FillPolygon( const Polygon& rPoly )
-{
-const sal_uInt16 nSize = rPoly.GetSize();
-
-if( nSize && mpFillColor )
-{
-const BitmapColor& rFillColor = *mpFillColor;
-Region aRegion( rPoly );
-// Rectangle aRect;
-
-aRegion.Intersect( Rectangle( Point(), Size( Width(), Height() ) ) );
-
-if( !aRegion.IsEmpty() )
-{
-RectangleVector aRectangles;
-aRegion.GetRegionRectangles(aRectangles);
-
-for(RectangleVector::const_iterator
aRectIter(aRectangles.begin()); aRectIter != aRectangles.end(); ++aRectIter)
-{
-for(long nY = aRectIter->Top(), nEndY = aRectIter->Bottom();
nY <= nEndY; nY++)
-{
-for(long nX = aRectIter->Left(), nEndX =
aRectIter->Right(); nX <= nEndX; nX++)
-{
-SetPixel(nY, nX, rFillColor);
-}
-}
-}
-
-//RegionHandle aRegHandle( aRegion.BeginEnumRects() );
-//
-//while( aRegion.GetEnumRects( aRegHandle, aRect ) )
-// for( long nY = aRect.Top(), nEndY = aRect.Bottom(); nY <=
nEndY; nY++ )
-// for( long nX = aRect.Left(), nEndX = aRect.Right(); nX <=
nEndX; nX++ )
-// SetPixel( nY, nX, rFillColor );
-//
-//aRegion.EndEnumRects( aRegHandle );
-}
-}
-}
-
void BitmapWriteAccess::FillPolyPolygon( const PolyPolygon& rPolyPoly )
{
const sal_uInt16 nCount = rPolyPoly.Count();
commit d11285ac88e5d9eabe49b2beaf08d5c762b8ce1b
Author: Julien Nabet
Date: Sat Aug 10 15:31:02 2013 +0200
Some cppcheck cleaning
Change-Id: I31539733914a66241e77a7246aebc50850dea2aa
diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index 96aba68..d9baff4 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -400,13 +400,11 @@ UCHAR GetTextChar(UCHAR* TBuf, sal_uInt16& Index,
ObjTextType& Atr0, ObjTextType& AktAtr,
sal_uInt16 Rest, bool ScanEsc)
{
-UCHAR c,c0,nc;
-
-c=ProcessOne(TBuf,Index,Atr0,AktAtr,ScanEsc);
+UCHAR c=ProcessOne(TBuf,Index,Atr0,AktAtr,ScanEsc);
if (!ScanEsc) {
if (c==SoftTrennAdd || c==SoftTrennK || c==SoftTrenn) {
-nc=GetNextChar(TBuf,Index);
-c0=c;
+UCHAR nc=GetNextChar(TBuf,Index);
+UCHAR c0=c;
if (Rest==0 || Rest==DoTrenn ||
nc==' ' || nc==AbsatzEnd || nc==TextEnd) c='-';
else {
@@ -693,7 +691,6 @@ UCHAR ProcessChar(OutputDevice& rOut, UCHAR* TBuf,
ProcChrSta& R, ObjTextType& A
sal_uInt16 KernDist=0; // Wert fuer Kerning
sal_uInt16 ChrWidth;
UCHARc;
-UCHARc1;
bool AbsEnd;
c=GetTextChar(TBuf,R.Index,Atr0,R.Attrib,Rest,false); // versucht evtl. zu
trennen, wenn Rest entsprechenden Wert besitzt
@@ -705,7 +702,7 @@ UCHAR ProcessChar(OutputDevice& rOut, UCHAR* TBuf,
ProcChrSta& R, ObjTextTyp
[Libreoffice-commits] core.git: sd/source
sd/source/ui/func/undolayer.cxx |4 +--
sd/source/ui/func/unprlout.cxx |6 ++---
sd/source/ui/inc/undolayer.hxx | 16 ++---
sd/source/ui/inc/unmodpg.hxx| 20 +
sd/source/ui/inc/unprlout.hxx | 10
sd/source/ui/view/unmodpg.cxx | 46 ++--
sd/source/ui/view/viewshe2.cxx |2 -
sd/source/ui/view/viewshe3.cxx | 14 ++--
sd/source/ui/view/viewshel.cxx |3 --
9 files changed, 59 insertions(+), 62 deletions(-)
New commits:
commit e1b8dfda24c75e91d8ebced7a4022b78ee7fca25
Author: Ivan Timofeev
Date: Sat Aug 10 16:30:45 2013 +0400
String->OUString
Change-Id: Ifda8c7453ecb40abdae8d63656b8742c80691b98
diff --git a/sd/source/ui/func/undolayer.cxx b/sd/source/ui/func/undolayer.cxx
index 52868cc..5954a2c 100644
--- a/sd/source/ui/func/undolayer.cxx
+++ b/sd/source/ui/func/undolayer.cxx
@@ -30,8 +30,8 @@ TYPEINIT1(SdLayerModifyUndoAction, SdUndoAction);
SdLayerModifyUndoAction::SdLayerModifyUndoAction(
SdDrawDocument* _pDoc, SdrLayer* pLayer,
-const String& rOldLayerName, const String& rOldLayerTitle, const String&
rOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool bOldIsPrintable,
-const String& rNewLayerName, const String& rNewLayerTitle, const String&
rNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool bNewIsPrintable )
+const OUString& rOldLayerName, const OUString& rOldLayerTitle, const
OUString& rOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool
bOldIsPrintable,
+const OUString& rNewLayerName, const OUString& rNewLayerTitle, const
OUString& rNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool
bNewIsPrintable )
: SdUndoAction( _pDoc ),
mpLayer( pLayer ),
maOldLayerName( rOldLayerName ),
diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx
index 35cb13b..1100fc6 100644
--- a/sd/source/ui/func/unprlout.cxx
+++ b/sd/source/ui/func/unprlout.cxx
@@ -30,8 +30,8 @@ TYPEINIT1(SdPresentationLayoutUndoAction, SdUndoAction);
SdPresentationLayoutUndoAction::SdPresentationLayoutUndoAction(
SdDrawDocument* pTheDoc,
-String aTheOldLayoutName,
-String aTheNewLayoutName,
+OUStringaTheOldLayoutName,
+OUStringaTheNewLayoutName,
AutoLayout eTheOldAutoLayout,
AutoLayout eTheNewAutoLayout,
sal_BoolbSet,
@@ -46,7 +46,7 @@
SdPresentationLayoutUndoAction::SdPresentationLayoutUndoAction(
DBG_ASSERT(pThePage, "No Page set!");
pPage = pThePage;
-aComment = String(SdResId(STR_UNDO_SET_PRESLAYOUT));
+aComment = SD_RESSTR(STR_UNDO_SET_PRESLAYOUT);
}
void SdPresentationLayoutUndoAction::Undo()
diff --git a/sd/source/ui/inc/undolayer.hxx b/sd/source/ui/inc/undolayer.hxx
index b5802da..9e9f93a 100644
--- a/sd/source/ui/inc/undolayer.hxx
+++ b/sd/source/ui/inc/undolayer.hxx
@@ -33,23 +33,23 @@ class SdLayerModifyUndoAction : public SdUndoAction
public:
TYPEINFO();
SdLayerModifyUndoAction( SdDrawDocument* _pDoc, SdrLayer* pLayer,
-const String& rOldLayerName, const String& rOldLayerTitle, const String&
rOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool bOldIsPrintable,
-const String& rNewLayerName, const String& rNewLayerTitle, const String&
rNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool bNewIsPrintable );
+const OUString& rOldLayerName, const OUString& rOldLayerTitle, const
OUString& rOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool
bOldIsPrintable,
+const OUString& rNewLayerName, const OUString& rNewLayerTitle, const
OUString& rNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool
bNewIsPrintable );
virtual void Undo();
virtual void Redo();
private:
SdrLayer* mpLayer;
-String maOldLayerName;
-String maOldLayerTitle;
-String maOldLayerDesc;
+OUString maOldLayerName;
+OUString maOldLayerTitle;
+OUString maOldLayerDesc;
bool mbOldIsVisible;
bool mbOldIsLocked;
bool mbOldIsPrintable;
-String maNewLayerName;
-String maNewLayerTitle;
-String maNewLayerDesc;
+OUString maNewLayerName;
+OUString maNewLayerTitle;
+OUString maNewLayerDesc;
bool mbNewIsVisible;
bool mbNewIsLocked;
bool mbNewIsPrintable;
diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx
index 44b942e..bd48758 100644
--- a/sd/source/ui/inc/unmodpg.hxx
+++ b/sd/source/ui/inc/unmodpg.hxx
@@ -29,8 +29,8 @@ class SdPage;
class ModifyPageUndoAction : public SdUndoAction
{
SdPage* mpPage;
-String maOldName;
-String maNewName;
+OUStringmaOldName;
+OUStringmaNewName;
AutoLayout meOldAutoLayout;
AutoLayout m
[Libreoffice-commits] core.git: sw/source
sw/source/ui/envelp/labelcfg.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit f115934e0a9146c0adf115abcb99e048c530349d Author: Tor Lillqvist Date: Sat Aug 10 15:19:41 2013 +0300 WaE: variable 'res' set but not used Change-Id: I3fc3f55d10dad177451100affacfff74d04a1fe8 diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx index f24f440..81f49f3 100644 --- a/sw/source/ui/envelp/labelcfg.cxx +++ b/sw/source/ui/envelp/labelcfg.cxx @@ -38,6 +38,7 @@ static inline void lcl_assertEndingItem(xmlreader::XmlReader& reader) xmlreader::XmlReader::Result res; res = reader.nextItem(xmlreader::XmlReader::TEXT_NONE, &name, &nsId); assert(res == xmlreader::XmlReader::RESULT_END); +(void) res; } static inline OUString lcl_getValue(xmlreader::XmlReader& reader, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: config_host/config_features.h.in configure.ac
config_host/config_features.h.in | 11 +++ configure.ac |1 + 2 files changed, 12 insertions(+) New commits: commit 3aefa4ef8020804a7dd1c03ce870d0cdd8c757c5 Author: Tor Lillqvist Date: Sat Aug 10 14:37:30 2013 +0300 Add HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE Change-Id: Idb114bfa3fbb05252a5cac9eb5f303ec85080626 diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in index 3b92e87..7d045df 100644 --- a/config_host/config_features.h.in +++ b/config_host/config_features.h.in @@ -88,6 +88,17 @@ #define HAVE_FEATURE_MACOSX_SANDBOX 0 +/* MACOSX_MACLIKE_APP_STRUCTURE - LibreOffice.app substructure style + * + * Whether the structure of the LibreOffice.app bundle is more + * "Mac-like" and what it has been previously, for instance with all + * dylibs in the "Frameworks" folder and all non-code data in a the + * "Resources" folder. For now coupled to HAVE_FEATURE_MACOSX_SANDBOX + * in configure.ac. + */ + +#define HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE 0 + /* READONLY_INSTALLSET - whether to treat the installation as read-only * * Prevents attempts by LibreOffice to write into its installation. That means diff --git a/configure.ac b/configure.ac index 3ade88e..c7c9638 100644 --- a/configure.ac +++ b/configure.ac @@ -2870,6 +2870,7 @@ if test $_os = Darwin -a "$ENABLE_MACOSX_SANDBOX" = YES; then LIBO_URE_LIB_FOLDER=Frameworks LIBO_URE_SHARE_FOLDER=Resources/ure LIBO_URE_SHARE_JAVA_FOLDER=Resources/java +AC_DEFINE(HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE) elif $_os = WINNT; then LIBO_BIN_FOLDER=program LIBO_ETC_FOLDER=program ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source include/sfx2 include/svtools include/svx include/toolkit sd/source sfx2/source svtools/source svx/source sw/source toolkit/source unusedcode.easy
dbaccess/source/ui/dlg/directsql.cxx| 29
include/sfx2/sidebar/ControlFactory.hxx |4
include/sfx2/sidebar/SidebarToolBox.hxx | 11 -
include/sfx2/tabdlg.hxx |2
include/svtools/editsyntaxhighlighter.hxx |1
include/svx/dlgctrl.hxx | 16 --
include/svx/paraprev.hxx|1
include/toolkit/helper/tkresmgr.hxx |3
sd/source/ui/animations/CustomAnimationCreateDialog.cxx |8 -
sd/source/ui/animations/CustomAnimationList.cxx | 14 --
sd/source/ui/animations/CustomAnimationList.hxx |1
sfx2/source/dialog/tabdlg.cxx | 37 -
sfx2/source/sidebar/ControlFactory.cxx | 15 --
sfx2/source/sidebar/SidebarToolBox.cxx | 41 -
svtools/source/edit/editsyntaxhighlighter.cxx |7 -
svx/source/dialog/dlgctrl.cxx | 111
svx/source/dialog/paraprev.cxx | 23 ---
sw/source/ui/inc/numberingtypelistbox.hxx |2
sw/source/ui/misc/numberingtypelistbox.cxx | 12 -
toolkit/source/helper/tkresmgr.cxx | 12 -
unusedcode.easy | 25 +++
21 files changed, 26 insertions(+), 349 deletions(-)
New commits:
commit bfafc8c3a137a98ad2cd939b11161f9961bc48d7
Author: Caolán McNamara
Date: Sat Aug 10 11:17:05 2013 +0100
callcatcher: update unused code
mostly ResId using ctors left stranded post .ui conversion
Change-Id: I06689eea30ee9146ba05294f52056c0d263695f5
diff --git a/dbaccess/source/ui/dlg/directsql.cxx
b/dbaccess/source/ui/dlg/directsql.cxx
index 91cb646..8393306 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -37,35 +37,6 @@ namespace dbaui
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::lang;
-
-//
-//= LargeEntryListBox
-//
-class LargeEntryListBox : public ListBox
-{
-public:
-LargeEntryListBox( Window* _pParent, const ResId& _rId );
-
-protected:
-virtual voidUserDraw( const UserDrawEvent& rUDEvt );
-};
-
-//
-LargeEntryListBox::LargeEntryListBox( Window* _pParent, const ResId& _rId )
-:ListBox(_pParent, _rId )
-{
-EnableUserDraw(sal_True);
-}
-
-//
-void LargeEntryListBox::UserDraw( const UserDrawEvent& _rUDEvt )
-{
-if (LISTBOX_ENTRY_NOTFOUND == _rUDEvt.GetItemId())
-ListBox::UserDraw( _rUDEvt );
-else
-_rUDEvt.GetDevice()->DrawText( _rUDEvt.GetRect(), GetEntry(
_rUDEvt.GetItemId() ), TEXT_DRAW_LEFT | TEXT_DRAW_VCENTER |
TEXT_DRAW_ENDELLIPSIS);
-}
-
//
//= DirectSQLDialog
//
diff --git a/include/sfx2/sidebar/ControlFactory.hxx
b/include/sfx2/sidebar/ControlFactory.hxx
index be66aecb3..af6d771 100644
--- a/include/sfx2/sidebar/ControlFactory.hxx
+++ b/include/sfx2/sidebar/ControlFactory.hxx
@@ -42,10 +42,6 @@ public:
static CheckBox* CreateMenuButton (Window* pParentWindow);
static ImageRadioButton* CreateTabItem (Window* pParentWindow);
-
-static ImageRadioButton* CreateCustomImageRadionButton(
-Window* pParentWindow,
-const ResId& rResId );
};
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx
b/include/sfx2/sidebar/SidebarToolBox.hxx
index ec63cc3..c3e01b8 100644
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@ -41,16 +41,7 @@ class SFX2_DLLPUBLIC SidebarToolBox
: public ToolBox
{
public:
-/** Create a new tool box.
-When a valid XFrame is given then the tool box will handle its
-buttons and drop-downs. Otherwise the caller has to do that.
-*/
-SidebarToolBox (
-Window* pParentWindow,
-const ResId& rResId,
-const cssu::Reference& rxFrame);
-SidebarToolBox (
-Window* pParentWindow);
+SidebarToolBox(Window* pParentWindow);
virtual ~SidebarToolBox (void);
using ToolBox::InsertItem;
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index ee8c1f6..9d31183 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -223,8 +223,6 @@ public:
const SfxItemSet* GetExampleSet() const { return pExampleSet; }
SfxViewFrame* GetViewFrame() const { return pFrame; }
-void
[Libreoffice-commits] core.git: 2 commits - config_host/config_folders.h.in config_host.mk.in configure.ac Makefile.in
Makefile.in |8 +--- config_host.mk.in |3 + config_host/config_folders.h.in | 42 configure.ac| 70 4 files changed, 118 insertions(+), 5 deletions(-) New commits: commit 6a84a6ed0b1d30c8feb551a3a4db5aab437a74f7 Author: Tor Lillqvist Date: Sat Aug 10 14:01:21 2013 +0300 Start of enabling use of a more proper "Mac-like" install tree structure First cut was at https://gerrit.libreoffice.org/#/c/2310/ but was abandoned by myself. Now getting back to the idea, but this time I will make it optional on OS X, and introduce it in smaller steps. Change-Id: Id88517fee8d49056b8bbecb0921206dc6b29580b diff --git a/config_host.mk.in b/config_host.mk.in index 4524b3b..060a40f 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -302,6 +302,9 @@ export LIBLANGTAG_CFLAGS=$(gb_SPACE)@LIBLANGTAG_CFLAGS@ export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@ export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@ export LIBLOADER_JAR=@LIBLOADER_JAR@ +export LIBO_BIN_FOLDER=@LIBO_BIN_FOLDER@ +export LIBO_SHARE_FOLDER=@LIBO_SHARE_FOLDER@ +export LIBO_SHARE_RESOURCE_FOLDER=@LIBO_SHARE_RESOURCE_FOLDER@ export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@ export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@ export LIBO_VERSION_MINOR=@LIBO_VERSION_MINOR@ diff --git a/config_host/config_folders.h.in b/config_host/config_folders.h.in new file mode 100644 index 000..f06abd6 --- /dev/null +++ b/config_host/config_folders.h.in @@ -0,0 +1,42 @@ +/* Configuration of subfolder names in the installation tree. The + * values of these macros when configured will be strings. The names + * of these macros reflect what the value would be in an "ideal" world + * on Linux, not current reality. (For example LIBO_BIN_FOLDER is + * actually "program" on Linux and most other Unixes.) + */ + +#ifndef CONFIG_FOLDERS_H +#define CONFIG_FOLDERS_H + +/* where the soffice executable and other end-user-invoked executables are */ +#undef LIBO_BIN_FOLDER + +/* where the *rc / *.ini file are */ +#undef LIBO_ETC_FOLDER + +/* where helper executables run by soffice are */ +#undef LIBO_LIBEXEC_FOLDER + +/* where dynamic libraries loaded directly or programmatically are */ +#undef LIBO_LIB_FOLDER + +/* where read-only resources are in general */ +#undef LIBO_SHARE_FOLDER + +/* where java jars are */ +#undef LIBO_SHARE_JAVA_FOLDER + +/* LO's own "resources" */ +#undef LIBO_SHARE_RESOURCE_FOLDER + +/* LO's "shell" artwork */ +#undef LIBO_SHARE_SHELL_FOLDER + +/* URE folders */ +#undef LIBO_URE_BIN_FOLDER +#undef LIBO_URE_ETC_FOLDER +#undef LIBO_URE_LIB_FOLDER +#undef LIBO_URE_SHARE_FOLDER +#undef LIBO_URE_SHARE_JAVA_FOLDER + +#endif diff --git a/configure.ac b/configure.ac index 63396d7..3ade88e 100644 --- a/configure.ac +++ b/configure.ac @@ -2850,6 +2850,75 @@ else fi dnl === +dnl Structure of install set +dnl === + +if test $_os = Darwin -a "$ENABLE_MACOSX_SANDBOX" = YES; then +// For now, couple whether to use a more "Mac-like" installation tree structure +// with the choice whether to use sandboxing. Could be a separate choice, or could +// be always on for OS X. +LIBO_BIN_FOLDER=MacOS +LIBO_ETC_FOLDER=Resources +LIBO_LIBEXEC_FOLDER=MacOS +LIBO_LIB_FOLDER=Frameworks +LIBO_SHARE_FOLDER=Resources +LIBO_SHARE_JAVA_FOLDER=Resources/java +LIBO_SHARE_RESOURCE_FOLDER=Resources/resource +LIBO_SHARE_SHELL_FOLDER=Resources/shell +LIBO_URE_BIN_FOLDER=MacOS +LIBO_URE_ETC_FOLDER=Resources +LIBO_URE_LIB_FOLDER=Frameworks +LIBO_URE_SHARE_FOLDER=Resources/ure +LIBO_URE_SHARE_JAVA_FOLDER=Resources/java +elif $_os = WINNT; then +LIBO_BIN_FOLDER=program +LIBO_ETC_FOLDER=program +LIBO_LIBEXEC_FOLDER=program +LIBO_LIB_FOLDER=program +LIBO_SHARE_FOLDER=share +LIBO_SHARE_JAVA_FOLDER=program/classes +LIBO_SHARE_RESOURCE_FOLDER=program/resource +LIBO_SHARE_SHELL_FOLDER=program/shell +LIBO_URE_BIN_FOLDER=ure-link/bin +LIBO_URE_ETC_FOLDER=ure-link/bin +LIBO_URE_LIB_FOLDER=ure-link/bin +LIBO_URE_SHARE_FOLDER=ure-link/share +LIBO_URE_SHARE_JAVA_FOLDER=ure-link/java +else +LIBO_BIN_FOLDER=program +LIBO_ETC_FOLDER=program +LIBO_LIBEXEC_FOLDER=program +LIBO_LIB_FOLDER=program +LIBO_SHARE_FOLDER=share +LIBO_SHARE_JAVA_FOLDER=program/classes +LIBO_SHARE_RESOURCE_FOLDER=program/resource +LIBO_SHARE_SHELL_FOLDER=program/shell +LIBO_URE_BIN_FOLDER=ure/bin +LIBO_URE_ETC_FOLDER=ure/bin +LIBO_URE_LIB_FOLDER=ure/lib +LIBO_URE_SHARE_FOLDER=ure/share +LIBO_URE_SHARE_JAVA_FOLDER=ure/share/java +fi +AC_DEFINE_UNQUOTED(LIBO_BIN_FOLDER,"$LIBO_BIN_FOLDER") +AC_DEFINE_UNQUOTED(LIBO_ETC_FOLDER,"$LIBO_ETC_FOLDER") +AC_DEFINE_UNQUOTED(LIBO_LIBEXEC_FOLDER,"$LIBO_LIBEXEC_
[Libreoffice-commits] core.git: sw/source
sw/source/ui/envelp/labelcfg.cxx |9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 5372bbd0136ee8006f0641e1a6afee5c0e07e253
Author: Matúš Kukan
Date: Sat Aug 10 12:57:52 2013 +0200
fdo#67799 read ending item also when assert is noop
Change-Id: I056212d0a01f7a647e846bbd1b605c04e1798a14
diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx
index dc815c7..f24f440 100644
--- a/sw/source/ui/envelp/labelcfg.cxx
+++ b/sw/source/ui/envelp/labelcfg.cxx
@@ -33,14 +33,11 @@ using namespace ::com::sun::star::beans;
static inline void lcl_assertEndingItem(xmlreader::XmlReader& reader)
{
-#if OSL_DEBUG_LEVEL > 0
int nsId;
xmlreader::Span name;
-assert(reader.nextItem(xmlreader::XmlReader::TEXT_NONE, &name, &nsId)
-== xmlreader::XmlReader::RESULT_END);
-#else
-(void)reader;
-#endif
+xmlreader::XmlReader::Result res;
+res = reader.nextItem(xmlreader::XmlReader::TEXT_NONE, &name, &nsId);
+assert(res == xmlreader::XmlReader::RESULT_END);
}
static inline OUString lcl_getValue(xmlreader::XmlReader& reader,
___
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 | 18 +++--- 1 file changed, 7 insertions(+), 11 deletions(-) New commits: commit 90520bfe633e65acded019179af3e9930ed1e238 Author: Tor Lillqvist Date: Sat Aug 10 13:29:12 2013 +0300 Simplify test and remove typo If what we want is to compile the OpenCL code by default always on OS X when building against a SDK newer than 10.6, that can be said simpler. Change-Id: I14b2cd107fe0dba42c221bec63fd4076fffbd848 diff --git a/configure.ac b/configure.ac index d0501f8..63396d7 100644 --- a/configure.ac +++ b/configure.ac @@ -10081,17 +10081,13 @@ OPENCL_LIBS= OPENCL_CFLAGS= ENABLE_OPENCL= AC_MSG_CHECKING([OpenCL]) -if test \( -z "$with_opencl_sdk" -o "$with_opencl_sdk" = yes \) -a $_os = Darwin ; then -# OS X -if test "$with_open_sdk" = yes -o "$with_macosx_sdk" != "10.6" ; then -AC_MSG_RESULT([yes, always on OS X]) -ENABLE_OPENCL=TRUE -OPENCL_CFLAGS= -OPENCL_LIBS="-framework OpenCL" -AC_DEFINE(HAVE_FEATURE_OPENCL) -else -AC_MSG_RESULT([no]) -fi +if test \( -z "$with_opencl_sdk" -o "$with_opencl_sdk" = yes \) -a $_os = Darwin -a "$with_macosx_sdk" != 10.6; then +# OS X SDK > 10.6 +AC_MSG_RESULT([yes, always on OS X > 10.6]) +ENABLE_OPENCL=TRUE +OPENCL_CFLAGS= +OPENCL_LIBS="-framework OpenCL" +AC_DEFINE(HAVE_FEATURE_OPENCL) elif test -z "$with_opencl_sdk" -o "$with_opencl_sdk" = no; then AC_MSG_RESULT([no]) else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/dlg/tabtempl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 38c1a22d50b3ff4102683f0fbd90a62574c2e08e
Author: Ivan Timofeev
Date: Sat Aug 10 14:40:33 2013 +0400
typo
Change-Id: Ib608d05fc76466f67f2172541f96ca77c571f341
diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx
index 7077321..7078241 100644
--- a/sd/source/ui/dlg/tabtempl.cxx
+++ b/sd/source/ui/dlg/tabtempl.cxx
@@ -94,7 +94,7 @@ SdTabTemplateDlg::SdTabTemplateDlg( Window* pParent,
m_nTabId = AddTabPage("tabs", RID_SVXPAGE_TABULATOR);
SvtCJKOptions aCJKOptions;
if( aCJKOptions.IsAsianTypographyEnabled() )
-m_nAsianTypoId = AddTabPage("asiantype", RID_SVXPAGE_PARA_ASIAN);
+m_nAsianTypoId = AddTabPage("asiantypo", RID_SVXPAGE_PARA_ASIAN);
else
RemoveTabPage("asiantypo");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/os2
vcl/os2/source/gdi/salprn.cxx | 136 +-
1 file changed, 94 insertions(+), 42 deletions(-)
New commits:
commit 950dbaff38ff81ea3ddf5157e83c7391774f34ab
Author: Yuri Dario
Date: Sat Aug 10 09:41:32 2013 +
i122990 - implemented missing InitPaperFormats and GetLandscapeAngle
methods.
diff --git a/vcl/os2/source/gdi/salprn.cxx b/vcl/os2/source/gdi/salprn.cxx
index 6294579..b98694e 100644
--- a/vcl/os2/source/gdi/salprn.cxx
+++ b/vcl/os2/source/gdi/salprn.cxx
@@ -57,32 +57,8 @@
#include
#include
-/*
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-*/
-
#include
-/*
-#define _SV_SALPRN_CXX
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-*/
-
#ifndef __H_FT2LIB
#include
#include
@@ -583,11 +559,15 @@ static void ImplFreeFormAndTrayList( Os2SalInfoPrinter*
pOs2SalInfoPrinter )
static void ImplGetFormAndTrayList( Os2SalInfoPrinter* pOs2SalInfoPrinter,
const ImplJobSetup* pSetupData )
{
+// if not defined, suppose default orientation is portrait
+Orientation orientation = ORIENTATION_PORTRAIT;
+
ImplFreeFormAndTrayList( pOs2SalInfoPrinter );
LONG alQuery[] =
{
0, 0, // First two members of QUERYSIZE
+DJP_SJ_ORIENTATION, DJP_CURRENT,
DJP_CJ_FORM,DJP_ALL,
DJP_CJ_TRAYNAME,DJP_ALL,
DJP_NONE, DJP_NONE// EOL marker
@@ -638,7 +618,18 @@ static void ImplGetFormAndTrayList( Os2SalInfoPrinter*
pOs2SalInfoPrinter, const
PQUERYTUPLE pTuple = pQuerySize->aTuples;
while ( DJP_NONE != pTuple->ulProperty )
{
-if ( pDJP->ulProperty == DJP_CJ_FORM )
+if ( pDJP->ulProperty == DJP_SJ_ORIENTATION )
+{
+if ( pDJP->ulNumReturned )
+{
+PDJPT_ORIENTATION pElm = DJP_ELEMENTP( *pDJP,
DJPT_ORIENTATION );
+if ( (DJP_ORI_PORTRAIT == *pElm) || (DJP_ORI_REV_PORTRAIT
== *pElm) )
+orientation = ORIENTATION_PORTRAIT;
+else
+orientation = ORIENTATION_LANDSCAPE;
+}
+}
+else if ( pDJP->ulProperty == DJP_CJ_FORM )
{
if ( pDJP->ulNumReturned )
{
@@ -649,11 +640,20 @@ static void ImplGetFormAndTrayList( Os2SalInfoPrinter*
pOs2SalInfoPrinter, const
for( int i = 0; i < pDJP->ulNumReturned; i++, pElm++ )
{
ImplFormInfo* pInfo = new ImplFormInfo;
-pInfo->mnPaperWidth = pElm->hcInfo.cx;
-pInfo->mnPaperHeight= pElm->hcInfo.cy;
+// AOO expects form size always in portrait mode
+if (orientation == ORIENTATION_PORTRAIT)
+{
+pInfo->mnPaperWidth = pElm->hcInfo.cx;
+pInfo->mnPaperHeight= pElm->hcInfo.cy;
+}
+else
+{
+pInfo->mnPaperWidth = pElm->hcInfo.cy;
+pInfo->mnPaperHeight= pElm->hcInfo.cx;
+}
#if OSL_DEBUG_LEVEL>0
-printf("ImplGetFormAndTrayList mnPaperWidth %d\n",
pInfo->mnPaperWidth);
-printf("ImplGetFormAndTrayList mnPaperHeight %d\n",
pInfo->mnPaperHeight);
+debug_printf("ImplGetFormAndTrayList #%d: %d x %d",
+ i, pInfo->mnPaperWidth,
pInfo->mnPaperHeight);
#endif
pInfo->mnId = pElm->djppsFormID;
pOs2SalInfoPrinter->mpFormArray[i] = pInfo;
@@ -865,6 +865,9 @@ static sal_Bool ImplSetOrientation( HDC hPrinterDC,
PDRIVDATA pDriverData,
DJP_SJ_ORIENTATION, DJP_CURRENT,
DJP_NONE, DJP_NONE// EOL marker
};
+#if OSL_DEBUG_LEVEL>0
+debug_printf( "ImplSetOrientation mhDC %x, %d", hPrinterDC, eOrientation);
+#endif
APIRET rc;
PQUERYSIZE pQuerySize = (PQUERYSIZE)alQuery;
@@ -1164,6 +1167,7 @@ Os2SalInfoPrinter::Os2SalInfoPrinter()
mpFormArray = NULL;
mnTrayCount = 0;
mpTrayArray = NULL;
+m_bPapersInit = FALSE;
}
// ---
@@ -1181,6 +1185,42 @@ Os2SalInfoPrinter::~Os2SalInfoPrinter()
// ---
+void Os2SalInfoPrinter::InitPaperFormats( const ImplJobSetup* pSetupData )
+{
+#if OSL_DEBUG_LEVEL>0
+debug_printf( "Os2SalInfoPrinter::InitPaperFormats pSetupData %x",
+ pSetupData);
+#endif
+
+m_aPaperFormats.clear();
+m_bPapersInit = true;
+
+// init pape
[Libreoffice-commits] dev-tools.git: 2 commits - scripts/esc-bug-stats.pl
scripts/esc-bug-stats.pl | 249 ---
1 file changed, 237 insertions(+), 12 deletions(-)
New commits:
commit 9ccb1417e77bc8af353e4db281dfd2d69ea3
Author: Michael Meeks
Date: Sat Aug 10 10:25:39 2013 +0100
Improve flat ods.
diff --git a/scripts/esc-bug-stats.pl b/scripts/esc-bug-stats.pl
index 307964c..ea8c65d 100755
--- a/scripts/esc-bug-stats.pl
+++ b/scripts/esc-bug-stats.pl
@@ -117,7 +117,7 @@ $component_count{'Migration'} =
get_deps("https://bugs.freedesktop.org/showdepen
$component_count{'Crashes'} =
get_query("https://bugs.freedesktop.org/buglist.cgi?keywords=regression&keywords_type=allwords&list_id=296015&short_desc=crash&query_based_on=CrashRegressions&query_format=advanced&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&short_desc_type=allwordssubstr&product=LibreOffice&known_name=CrashRegressions";);
$component_count{'Borders'} =
get_query("https://bugs.freedesktop.org/buglist.cgi?keywords=regression&keywords_type=allwords&list_id=296016&short_desc=border&query_based_on=BorderRegressions&query_format=advanced&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&short_desc_type=allwordssubstr&product=LibreOffice&known_name=BorderRegressions";);
-my @reg_toquery = ( 'Spreadsheet', 'Presentation', 'Database', 'Drawing',
'LibreOffice', 'Writer', 'BASIC' );
+my @reg_toquery = ( 'Spreadsheet', 'Presentation', 'Database', 'Drawing',
'Libreoffice', 'Writer', 'BASIC' );
for my $component (@reg_toquery) {
$component_count{$component} =
get_query("https://bugs.freedesktop.org/buglist.cgi?keywords=regression&keywords_type=allwords&list_id=296025&query_format=advanced&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=PLEASETEST&component=$component&product=LibreOffice";);
}
@@ -290,7 +290,7 @@ EOF
;
my @output_order = ( 'Spreadsheet', 'Presentation', 'Database', 'Drawing',
-'LibreOffice', 'Borders', 'Crashes', 'BASIC', 'Writer/RTF',
+'Libreoffice', 'Borders', 'Crashes', 'BASIC', 'Writer/RTF',
'Writer', 'Migration' );
for my $foo (@output_order) {
commit 703a95af4f604e91bb70d7c20f1abdc56ddea169
Author: Michael Meeks
Date: Tue Aug 6 13:44:15 2013 +0200
Print out flat-ods to accelerate bug-metrics build.
diff --git a/scripts/esc-bug-stats.pl b/scripts/esc-bug-stats.pl
index 9604ece..307964c 100755
--- a/scripts/esc-bug-stats.pl
+++ b/scripts/esc-bug-stats.pl
@@ -1,5 +1,8 @@
#!/usr/bin/perl -w
+# use me for testing XML pretty printing etc.
+my $fast_debug = 0;
+
sub get_url($)
{
my $url = shift;
@@ -16,6 +19,9 @@ sub get_url($)
sub get_deps($)
{
my ($url) = @_;
+
+return 42 if ($fast_debug);
+
my @bugs = get_url($url);
my $bug_count = -1;
@@ -42,6 +48,9 @@ sub get_deps($)
sub get_query($)
{
my ($url) = @_;
+
+return 6 if ($fast_debug);
+
my @bugs = get_url($url);
my $bug_count = -1;
@@ -61,6 +70,9 @@ my %bug_to_ver = (
'3.6' => '6'
);
+my %ver_open;
+my %ver_total;
+
print STDERR "Querying for open MABs:\n";
for my $ver (sort keys %bug_to_ver) {
my $bug = $bug_to_ver{$ver};
@@ -68,7 +80,9 @@ for my $ver (sort keys %bug_to_ver) {
my $all = get_deps($base_url);
my $open = get_deps($base_url . "&hide_resolved=1");
$percent = ($open * 100.0) / $all;
-print "$ver: $open/$all - $percent%\n";
+print STDERR "$ver: $open/$all - $percent%\n";
+$ver_open{$ver} = $open;
+$ver_total{$ver} = $all;
}
my ($reg_all, $reg_open);
@@ -86,15 +100,15 @@ my $bibisect_open_query =
"https://bugs.freedesktop.org/buglist.cgi?n2=1&f1=stat
my ($all, $open);
$all = get_query($bibisect_query);
$open = get_query($bibisect_open_query);
-print "\n";
-print "* Bibisected bugs open: whiteboard 'bibsected'\n";
-print "\t+ $open (of $all) older ?\n";
-print "\t\t+ http://bit.ly/VQfF3Q\n";;
-print "\n";
+print STDERR "\n";
+print STDERR "* Bibisected bugs open: whiteboard 'bibsected'\n";
+print STDERR "\t+ $open (of $all) older ?\n";
+print STDERR "\t\t+ http://bit.ly/VQfF3Q\n";;
+print STDERR "\n";
-print "* all bugs tagged with 'regression'\n";
-print "\t+ $reg_open(+?) bugs open of $reg_all(+?) total\n";
-print "\n";
+print STDERR "* all bugs tagged with 'regression'\n";
+print STDERR "\t+ $reg_open(+?) bugs open of $reg_all(+?) total\n";
+print STDERR "\n";
my %component_count;
@@ -103,13 +117,224 @@ $component_count{'Migration'} =
get_deps("https://bugs.freedesktop.org/showdepen
$component_count{'Crashes'} =
get_query("https://bugs.freedesktop.org/buglist.cgi?keywords=regression&keywords_type=allwords&list_id=296015&short_desc=crash&query_based_on=CrashRegressions&query_format=advanced&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&short_desc_type=allwordssubstr&product=Lib
[Libreoffice-commits] core.git: Branch 'feature/vlc' - avmedia/source
avmedia/source/vlc/wrapper/EventManager.cxx | 76 +---
1 file changed, 4 insertions(+), 72 deletions(-)
New commits:
commit 1eee6ec3e0773d8c760987c0e98bdc1088b3e6d1
Author: Minh Ngo
Date: Sat Aug 10 11:26:14 2013 +0300
Includes for building.
Change-Id: I55f9ea19f0be650bcf9dd63cd7a6f86a01679b62
diff --git a/avmedia/source/vlc/wrapper/EventManager.cxx
b/avmedia/source/vlc/wrapper/EventManager.cxx
index 6ae5bc9..bafd4a9 100644
--- a/avmedia/source/vlc/wrapper/EventManager.cxx
+++ b/avmedia/source/vlc/wrapper/EventManager.cxx
@@ -1,84 +1,16 @@
+#include
+#include
+#include
+
#include "EventManager.hxx"
#include "SymbolLoader.hxx"
-typedef struct libvlc_event_t
-{
-int type;
-void *p_obj;
-union
-{
-struct
-{
-void *p;
-} media_meta_changed;
-} u;
-} libvlc_event_t;
-
-typedef int libvlc_event_type_t;
typedef void ( *libvlc_callback_t ) ( const struct libvlc_event_t *, void * );
namespace VLC
{
namespace
{
-enum libvlc_event_e {
-libvlc_MediaMetaChanged=0,
-libvlc_MediaSubItemAdded,
-libvlc_MediaDurationChanged,
-libvlc_MediaParsedChanged,
-libvlc_MediaFreed,
-libvlc_MediaStateChanged,
-
-libvlc_MediaPlayerMediaChanged=0x100,
-libvlc_MediaPlayerNothingSpecial,
-libvlc_MediaPlayerOpening,
-libvlc_MediaPlayerBuffering,
-libvlc_MediaPlayerPlaying,
-libvlc_MediaPlayerPaused,
-libvlc_MediaPlayerStopped,
-libvlc_MediaPlayerForward,
-libvlc_MediaPlayerBackward,
-libvlc_MediaPlayerEndReached,
-libvlc_MediaPlayerEncounteredError,
-libvlc_MediaPlayerTimeChanged,
-libvlc_MediaPlayerPositionChanged,
-libvlc_MediaPlayerSeekableChanged,
-libvlc_MediaPlayerPausableChanged,
-libvlc_MediaPlayerTitleChanged,
-libvlc_MediaPlayerSnapshotTaken,
-libvlc_MediaPlayerLengthChanged,
-libvlc_MediaPlayerVout,
-
-libvlc_MediaListItemAdded=0x200,
-libvlc_MediaListWillAddItem,
-libvlc_MediaListItemDeleted,
-libvlc_MediaListWillDeleteItem,
-
-libvlc_MediaListViewItemAdded=0x300,
-libvlc_MediaListViewWillAddItem,
-libvlc_MediaListViewItemDeleted,
-libvlc_MediaListViewWillDeleteItem,
-
-libvlc_MediaListPlayerPlayed=0x400,
-libvlc_MediaListPlayerNextItemSet,
-libvlc_MediaListPlayerStopped,
-
-libvlc_MediaDiscovererStarted=0x500,
-libvlc_MediaDiscovererEnded,
-
-libvlc_VlmMediaAdded=0x600,
-libvlc_VlmMediaRemoved,
-libvlc_VlmMediaChanged,
-libvlc_VlmMediaInstanceStarted,
-libvlc_VlmMediaInstanceStopped,
-libvlc_VlmMediaInstanceStatusInit,
-libvlc_VlmMediaInstanceStatusOpening,
-libvlc_VlmMediaInstanceStatusPlaying,
-libvlc_VlmMediaInstanceStatusPause,
-libvlc_VlmMediaInstanceStatusEnd,
-libvlc_VlmMediaInstanceStatusError
-};
-
libvlc_event_manager_t* ( *libvlc_media_player_event_manager ) (
libvlc_media_player_t *p_mi );
int ( *libvlc_event_attach ) ( libvlc_event_manager_t *p_event_manager,
libvlc_event_type_t i_event_type,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/vlc' - avmedia/source
avmedia/source/vlc/vlcplayer.cxx |8 ++--
avmedia/source/vlc/wrapper/Player.cxx |9 -
avmedia/source/vlc/wrapper/Player.hxx |2 +-
3 files changed, 11 insertions(+), 8 deletions(-)
New commits:
commit cb84b2cdecd7953ffac63b137e1d7a631aee2963
Author: Minh Ngo
Date: Sat Aug 10 10:58:36 2013 +0300
MacOS/Windows stuff
Change-Id: I237cf543fc198a65af2d90ca6044f9e429b09b98
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index 64d8565..945d7d9 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -179,13 +179,9 @@ uno::Reference< css::media::XPlayerWindow > SAL_CALL
VLCPlayer::createPlayerWind
const int winID = GetWindowID( aArguments );
-if (winID != -1)
+if ( winID != -1 )
{
-#if defined(WIN32) && !defined(UNIX)
-//TODO: Not works, will be crashed
-#else
-mPlayer.setXWindow( winID );
-#endif
+mPlayer.setWindow( winID );
}
return uno::Reference< css::media::XPlayerWindow >( window );
diff --git a/avmedia/source/vlc/wrapper/Player.cxx
b/avmedia/source/vlc/wrapper/Player.cxx
index 29f2536..37779d1 100644
--- a/avmedia/source/vlc/wrapper/Player.cxx
+++ b/avmedia/source/vlc/wrapper/Player.cxx
@@ -131,9 +131,16 @@ namespace VLC
return libvlc_audio_get_mute( mPlayer );
}
-void Player::setXWindow( int id )
+
+void Player::setWindow( int id )
{
+#if defined( UNX )
libvlc_media_player_set_xwindow( mPlayer, id );
+#elif defined( MACOS )
+libvlc_media_player_set_nsobject( mPlayer, reinterpret_cast( id
) );
+#elif defined( WNT )
+libvlc_media_player_set_hwnd( mPlayer, reinterpret_cast( id ) );
+#endif
}
void Player::takeSnapshot(const rtl::OUString& file)
diff --git a/avmedia/source/vlc/wrapper/Player.hxx
b/avmedia/source/vlc/wrapper/Player.hxx
index f1b3958..7832ad9 100644
--- a/avmedia/source/vlc/wrapper/Player.hxx
+++ b/avmedia/source/vlc/wrapper/Player.hxx
@@ -52,7 +52,7 @@ namespace VLC
void setMute( bool mute);
bool getMute() const;
-void setXWindow( int id );
+void setWindow( int id );
void takeSnapshot(const rtl::OUString& file);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/vlc' - avmedia/source
avmedia/source/vlc/vlcplayer.cxx |3 ++-
avmedia/source/vlc/wrapper/Player.cxx |9 -
avmedia/source/vlc/wrapper/Player.hxx |2 ++
3 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 7f3273d1bf2ef1ad239e80281764d3bf21cf3d8b
Author: Minh Ngo
Date: Sat Aug 10 10:34:13 2013 +0300
Disabling the mouse handling event in the VLC engine.
Change-Id: I348f7830b2ed86ddc21a48e0b482adfafc0175cd
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index ba304f7..64d8565 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -19,7 +19,7 @@ const char * const VLC_ARGS[] = {
"-Vdummy",
"--snapshot-format=png",
"--ffmpeg-threads",
-"--verbose=-1",
+"--verbose=2"
};
const int MS_IN_SEC = 1000; // Millisec in sec
@@ -33,6 +33,7 @@ VLCPlayer::VLCPlayer( const rtl::OUString& url )
, mUrl( url )
, mPlaybackLoop( false )
{
+mPlayer.setMouseHandling(false);
}
const rtl::OUString& VLCPlayer::url() const
diff --git a/avmedia/source/vlc/wrapper/Player.cxx
b/avmedia/source/vlc/wrapper/Player.cxx
index b67f1b2..29f2536 100644
--- a/avmedia/source/vlc/wrapper/Player.cxx
+++ b/avmedia/source/vlc/wrapper/Player.cxx
@@ -30,6 +30,7 @@ namespace VLC
unsigned int i_height );
void ( *libvlc_media_player_set_xwindow ) ( libvlc_media_player_t
*p_mi, uint32_t drawable );
unsigned ( *libvlc_media_player_has_vout ) ( libvlc_media_player_t
*p_mi );
+void ( *libvlc_video_set_mouse_input ) ( libvlc_media_player_t *p_mi,
unsigned on);
ApiMap VLC_PLAYER_API[] =
{
@@ -49,7 +50,8 @@ namespace VLC
SYM_MAP( libvlc_audio_get_mute ),
SYM_MAP( libvlc_video_take_snapshot ),
SYM_MAP( libvlc_media_player_set_xwindow ),
-SYM_MAP( libvlc_media_player_has_vout )
+SYM_MAP( libvlc_media_player_has_vout ),
+SYM_MAP( libvlc_video_set_mouse_input )
};
}
@@ -89,6 +91,11 @@ namespace VLC
return libvlc_media_player_get_time( mPlayer );
}
+void Player::setMouseHandling(bool flag)
+{
+libvlc_video_set_mouse_input( mPlayer, flag );
+}
+
bool Player::isPlaying() const
{
return libvlc_media_player_is_playing( mPlayer ) == 1;
diff --git a/avmedia/source/vlc/wrapper/Player.hxx
b/avmedia/source/vlc/wrapper/Player.hxx
index e23acb7..f1b3958 100644
--- a/avmedia/source/vlc/wrapper/Player.hxx
+++ b/avmedia/source/vlc/wrapper/Player.hxx
@@ -63,6 +63,8 @@ namespace VLC
return mPlayer;
}
+void setMouseHandling(bool flag);
+
private:
libvlc_media_player_t *mPlayer;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 tommy27 changed: What|Removed |Added Depends on||44617 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 tommy27 changed: What|Removed |Added Depends on|44617 | -- 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
