[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 14 ++
sw/source/filter/ww8/docxattributeoutput.hxx |4 ++--
2 files changed, 4 insertions(+), 14 deletions(-)
New commits:
commit bdff04c635f9b65485f6a5a79116699cb1e82d72
Author: Miklos Vajna
Date: Fri Apr 3 09:08:33 2015 +0200
DOCX export: use std::shared_ptr<> in FieldInfos::pField
Change-Id: I8165adcad90e98cd166e27586f4948deb24b22c9
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 3fbd96d..793f85c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1031,8 +1031,6 @@ void DocxAttributeOutput::EndRun()
// Unknown fields should be removed too
if ( !pIt->bClose || ( pIt->eType == ww::eUNKNOWN ) )
{
-if (pIt->pField)
-delete pIt->pField;
pIt = m_Fields.erase( pIt );
continue;
}
@@ -1071,8 +1069,6 @@ void DocxAttributeOutput::EndRun()
// If fields begin before hyperlink then
// it should end before hyperlink close
EndField_Impl( m_Fields.back( ) );
-if (m_Fields.back().pField)
-delete m_Fields.back().pField;
m_Fields.pop_back();
}
m_pSerializer->endElementNS( XML_w, XML_hyperlink );
@@ -1093,8 +1089,6 @@ void DocxAttributeOutput::EndRun()
// Remove the field if no end needs to be written
if ( !pIt->bClose ) {
-if (pIt->pField)
-delete pIt->pField;
pIt = m_Fields.erase( pIt );
continue;
}
@@ -1225,8 +1219,6 @@ void DocxAttributeOutput::EndRun()
// If fields begin after hyperlink start then
// it should end before hyperlink close
EndField_Impl( m_Fields.back( ) );
-if (m_Fields.back().pField)
-delete m_Fields.back().pField;
m_Fields.pop_back();
}
@@ -1241,8 +1233,6 @@ void DocxAttributeOutput::EndRun()
while ( m_Fields.begin() != m_Fields.end() )
{
EndField_Impl( m_Fields.front( ) );
-if (m_Fields.front().pField)
-delete m_Fields.front().pField;
m_Fields.erase( m_Fields.begin( ) );
}
}
@@ -1405,7 +1395,7 @@ void DocxAttributeOutput::StartField_Impl( FieldInfos&
rInfos, bool bWriteRun )
WriteFFData( rInfos );
if ( rInfos.pField )
{
-const SwDropDownField& rFld2 = *static_cast(rInfos.pField);
+const SwDropDownField& rFld2 = *static_cast(rInfos.pField.get());
uno::Sequence aItems =
rFld2.GetItemSequence();
GetExport().DoComboBox(rFld2.GetName(),
@@ -6552,7 +6542,7 @@ void DocxAttributeOutput::WriteField_Impl( const SwField*
pFld, ww::eField eType
{
struct FieldInfos infos;
if (pFld)
-infos.pField = pFld->CopyField();
+infos.pField.reset(pFld->CopyField());
infos.sCmd = rFldCmd;
infos.eType = eType;
infos.bClose = WRITEFIELD_CLOSE & nMode;
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 15ff8b6..c63efd3 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -52,13 +52,13 @@ namespace oox { namespace drawingml { class DrawingML; } }
struct FieldInfos
{
-const SwField*pField;
+std::shared_ptr pField;
const ::sw::mark::IFieldmark* pFieldmark;
ww::eField eType;
boolbOpen;
boolbClose;
OUStringsCmd;
-FieldInfos() : pField(NULL), pFieldmark(NULL), eType(ww::eUNKNOWN),
bOpen(false), bClose(false){}
+FieldInfos() : pFieldmark(NULL), eType(ww::eUNKNOWN), bOpen(false),
bClose(false){}
};
enum DocxColBreakStatus
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source
sw/source/core/edit/eddel.cxx | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
New commits:
commit d8d946210a39400e4fc0b83f186e6234ad364836
Author: Michael Stahl
Date: Thu Apr 2 22:32:59 2015 +0200
tdf#87400: sw: fix ~SwIndexReg assertion in AutoCorrect
SwAutoFormat::DoUnderline() calls DeleteSel() with a SwPaM that is not
corrected, except if it's passed along directly to SwDoc methods.
(regression from f9b62506b22c3eb885ffd5a4ec8025c33df7b2d4)
Change-Id: I741e0391e7f8e09a64bcfe99ca4d650f1016aaa7
(cherry picked from commit 41e4998cdeb54a6fc316f349de61296be820fe47)
Reviewed-on: https://gerrit.libreoffice.org/15127
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index 3e4f06d..8be74f3 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -90,14 +90,20 @@ void SwEditShell::DeleteSel( SwPaM& rPam, bool* pUndo )
}
else
{
-SwPaM aPam(rPam);
+std::unique_ptr pNewPam;
+SwPaM * pPam = &rPam;
if (bSelectAll)
+{
+assert(dynamic_cast(&rPam)); // must be corrected pam
+pNewPam.reset(new SwPaM(rPam));
// Selection starts at the first para of the first cell, but we
// want to delete the table node before the first cell as well.
-aPam.Start()->nNode =
aPam.Start()->nNode.GetNode().FindTableNode()->GetIndex();
+pNewPam->Start()->nNode =
pNewPam->Start()->nNode.GetNode().FindTableNode()->GetIndex();
+pPam = pNewPam.get();
+}
// delete everything
-GetDoc()->getIDocumentContentOperations().DeleteAndJoin( aPam );
-SaveTblBoxCntnt( aPam.GetPoint() );
+GetDoc()->getIDocumentContentOperations().DeleteAndJoin(*pPam);
+SaveTblBoxCntnt( pPam->GetPoint() );
}
// Selection is not needed anymore
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source
sw/source/core/bastyp/index.cxx |1 +
sw/source/core/edit/eddel.cxx |1 +
2 files changed, 2 insertions(+)
New commits:
commit add86b9d5fcf3cb52549e64be148ba9e7bb4005e
Author: Michael Stahl
Date: Thu Apr 2 23:33:41 2015 +0200
sw: fix crash on SwUndoDelete after select-all with table at start
Somehow the Redo leaves the shell cursor at an invalid offset into the
paragraph, which then leads to out-of-bounds string access.
Noticed that SwUndRng::SetPaM() leaves an invalid nContent.m_nIndex on
the start position, due to a surprising omission in SwIndex::ChgValue().
(regression from 555ff26501d1bbd8a7872c20671c6303db1e1701)
Change-Id: I6e6ad7f70835d7e9d6da1fb680e2ae15469fad71
(cherry picked from commit b24a15a0aaea310806259eaa20a7d509ce30e5c8)
Reviewed-on: https://gerrit.libreoffice.org/15128
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index d77e2396..dc5041f 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -81,6 +81,7 @@ SwIndex& SwIndex::ChgValue( const SwIndex& rIdx, sal_Int32
nNewValue )
assert(m_pIndexReg == rIdx.m_pIndexReg);
if (!m_pIndexReg)
{
+m_nIndex = 0;
return *this; // no IndexReg => no list to sort into; m_nIndex is 0
}
SwIndex* pFnd = const_cast(&rIdx);
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index 8be74f3..789c4c4 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -99,6 +99,7 @@ void SwEditShell::DeleteSel( SwPaM& rPam, bool* pUndo )
// Selection starts at the first para of the first cell, but we
// want to delete the table node before the first cell as well.
pNewPam->Start()->nNode =
pNewPam->Start()->nNode.GetNode().FindTableNode()->GetIndex();
+pNewPam->Start()->nContent.Assign(nullptr, 0);
pPam = pNewPam.get();
}
// delete everything
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source
sw/source/uibase/utlui/content.cxx | 15 ++-
1 file changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 530c8def8a11c98d6e2afab1e4954f5914741b0b
Author: Michael Stahl
Date: Wed Apr 1 15:45:39 2015 +0200
tdf#88360: sw: fix crash on closing help in Navigator window
SwContentTree::pActiveShell is not cleared because of a check that the
shell exists, which is only done in the special case bIsConstant.
* at most one of bIsActive or bIsConstant is true
* the only place that calls SetActiveShell() if bIsConstant is true
already checks this condition
So remove the unnecessary check from SetActiveShell()
(regression from 329742e6c9da7cd7848d92a6846e3d1249d8d9b4)
(cherry picked from commit 7ddd6c008142a6b88878ffc96f5e339a0fddd7d9)
Change-Id: Id3b3b98bd38303b5afc529cc8be669872bd354b7
Reviewed-on: https://gerrit.libreoffice.org/15104
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index 5a6c75e..b9a9380 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -2220,15 +2220,12 @@ void SwContentTree::SetActiveShell(SwWrtShell* pSh)
}
else if(bIsConstant)
{
-if(!lcl_FindShell(pActiveShell))
-{
-if (pActiveShell)
-EndListening(*pActiveShell->GetView().GetDocShell());
-pActiveShell = pSh;
-bIsActive = true;
-bIsConstant = false;
-bClear = true;
-}
+if (pActiveShell)
+EndListening(*pActiveShell->GetView().GetDocShell());
+pActiveShell = pSh;
+bIsActive = true;
+bIsConstant = false;
+bClear = true;
}
// Only if it is the active view, the array will be deleted and
// the screen filled new.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - vcl/source
vcl/source/control/ilstbox.cxx | 22 +-
1 file changed, 13 insertions(+), 9 deletions(-)
New commits:
commit ae0de4ffdb480745b69d2d6413c656db4112d4a7
Author: Julien Nabet
Date: Thu Mar 26 22:46:00 2015 +0100
tdf#81813: Typing to select value in dropdown resets after space character
Change-Id: I6972cdad9708a46bb8338590312196e55c4f8778
Reviewed-on: https://gerrit.libreoffice.org/15024
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit 44c87a5dc921ea6dd28fdc016c61aa62cfd4f4d6)
Reviewed-on: https://gerrit.libreoffice.org/15098
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 9c66383..29f5462 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -1356,6 +1356,7 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent&
rKEvt )
bool bCtrl = aKeyCode.IsMod1() || aKeyCode.IsMod3();
bool bMod2 = aKeyCode.IsMod2();
bool bDone = false;
+bool bHandleKey = false;
switch( aKeyCode.GetCode() )
{
@@ -1571,7 +1572,7 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent&
rKEvt )
}
bDone = true;
}
-maQuickSelectionEngine.Reset();
+bHandleKey = true;
}
break;
@@ -1594,18 +1595,21 @@ bool ImplListBoxWindow::ProcessKeyInput( const
KeyEvent& rKEvt )
maQuickSelectionEngine.Reset();
bDone = true;
-break;
}
-}
-// fall through intentional
-default:
-{
-if ( !IsReadOnly() )
+else
{
-bDone = maQuickSelectionEngine.HandleKeyEvent( rKEvt );
+bHandleKey = true;
}
- }
+}
break;
+
+default:
+bHandleKey = true;
+break;
+}
+if (bHandleKey && !IsReadOnly())
+{
+bDone = maQuickSelectionEngine.HandleKeyEvent( rKEvt );
}
if ( ( nSelect != LISTBOX_ENTRY_NOTFOUND )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - editeng/source
editeng/source/editeng/editobj.cxx | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 5eafe30b41c9445b16b2cfe08ac4eb8a9cb3ccb1
Author: Michael Stahl
Date: Thu Apr 2 11:45:13 2015 +0200
tdf#85496: editeng: suppress all duplicate attributes during export
Since commit 0d57434180db6c8eda8c5b9b704f8a1c18b371df multiple 0-length
attributes will be exported by the ODF filter as duplicate attributes.
846b56b6b99e334dfa44f1a24640aa3158509854 was apparently not the only
bug that could cause this; unfortunately nobody is able to reproduce
the editing operations that result in the newly reported issue,
so just take the safe approach and check for duplicates,
as is already done in the libreoffice-4-3 and libreoffice-4-2 branches.
Change-Id: I1de10a99f6b84a0f4ea793ad55aaf6953b8307d5
(cherry picked from commit 5ece3e3525b0ef62e1b0e59ac5446aec0538d0d3)
Reviewed-on: https://gerrit.libreoffice.org/15117
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/editeng/source/editeng/editobj.cxx
b/editeng/source/editeng/editobj.cxx
index 332e71e..350e0d9 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -978,11 +978,18 @@ void EditTextObjectImpl::GetAllSections(
std::vector& rAttrs )
{
editeng::Section& rSecAttr = *itCurAttr;
// serious bug: will cause duplicate attributes to be exported
-assert(rSecAttr.maAttributes.end() == std::find_if(
+auto iter(std::find_if(
rSecAttr.maAttributes.begin(), rSecAttr.maAttributes.end(),
[&pItem](SfxPoolItem const*const pIt)
{ return pIt->Which() == pItem->Which(); }));
-rSecAttr.maAttributes.push_back(pItem);
+if (rSecAttr.maAttributes.end() == iter)
+{
+rSecAttr.maAttributes.push_back(pItem);
+}
+else
+{
+SAL_WARN("editeng", "GetAllSections(): duplicate attribute
suppressed");
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sfx2/source
sfx2/source/appl/appbaslib.cxx | 14 ++
sfx2/source/inc/appbaslib.hxx |4
2 files changed, 18 insertions(+)
New commits:
commit 637f9ffa6317d7b06e562283f210f67ecafe9e42
Author: Michael Stahl
Date: Tue Mar 31 19:01:25 2015 +0200
sfx2: fix VBA crash when disposing SfxBaseModel
Crash on WNT in CppunitTest_sw_globalfilter testSkipImages()
SfxBaseModel::dispose() calls some event listener that deletes the
BasicManager instance; unfortunately SfxObjectShell_Impl has a
SfxBasicHolder member that still refers to the deleted BasicManager
and then something calls vba::getVBAServiceFactory()...
Try to fix that by clearing the SfxBasicHolder member via SfxListener.
Change-Id: I65f2ec8e9eb598be218136c06ed8de35a464a971
(cherry picked from commit fae6699c2ec8d68766bb8d5f71483d4b65792327)
Reviewed-on: https://gerrit.libreoffice.org/15103
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx
index 980f2db..e220917 100644
--- a/sfx2/source/appl/appbaslib.cxx
+++ b/sfx2/source/appl/appbaslib.cxx
@@ -43,6 +43,19 @@ SfxBasicManagerHolder::SfxBasicManagerHolder()
{
}
+void SfxBasicManagerHolder::Notify(SfxBroadcaster& rBC, SfxHint const& rHint)
+{
+if (!mpBasicManager || &rBC != mpBasicManager)
+return;
+SfxSimpleHint const*const pSimpleHint(dynamic_cast(&rHint));
+if (pSimpleHint && SFX_HINT_DYING == pSimpleHint->GetId())
+{
+mpBasicManager = nullptr;
+mxBasicContainer.clear();
+mxDialogContainer.clear();
+}
+}
+
void SfxBasicManagerHolder::reset( BasicManager* _pBasicManager )
{
impl_releaseContainers();
@@ -59,6 +72,7 @@ void SfxBasicManagerHolder::reset( BasicManager*
_pBasicManager )
if ( mpBasicManager )
{
+StartListening(*mpBasicManager);
try
{
mxBasicContainer.set( mpBasicManager->GetScriptLibraryContainer(),
UNO_QUERY_THROW );
diff --git a/sfx2/source/inc/appbaslib.hxx b/sfx2/source/inc/appbaslib.hxx
index 5810afd..8e0d5f8 100644
--- a/sfx2/source/inc/appbaslib.hxx
+++ b/sfx2/source/inc/appbaslib.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_SFX2_SOURCE_INC_APPBASLIB_HXX
#define INCLUDED_SFX2_SOURCE_INC_APPBASLIB_HXX
+#include
+
#include
#include
#include
@@ -29,6 +31,7 @@ class BasicManager;
/** helper class which holds and manipulates a BasicManager
*/
class SfxBasicManagerHolder
+: public SfxListener
{
private:
BasicManager* mpBasicManager;
@@ -84,6 +87,7 @@ public:
*/
bool LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequence<
OUString >& sModules );
+virtual void Notify(SfxBroadcaster& rBC, SfxHint const& rHint)
SAL_OVERRIDE;
private:
voidimpl_releaseContainers();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source
sw/source/uibase/uno/unotxdoc.cxx | 19 ---
1 file changed, 8 insertions(+), 11 deletions(-)
New commits:
commit 4176d652a5aa31e6ea7a1be1798819ceb0d2b007
Author: Michael Stahl
Date: Tue Mar 31 15:35:36 2015 +0200
sw: fix obscure crash in SwXTextDocument::getSomething()
xNumFmtAgg may be null if you directly call global ServiceManager's
createInstanceWithContext("com.sun.star.text.TextDocument")
Change-Id: Id619a3f5c9e3f8281f9ef72db132c64287e027c4
(cherry picked from commit d360477d8740f29e2c2bc5f7bbd667df7cd26ee9)
Reviewed-on: https://gerrit.libreoffice.org/15102
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index 50dc5f8..7b0b82c 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -263,19 +263,16 @@ sal_Int64 SAL_CALL SwXTextDocument::getSomething( const
Sequence< sal_Int8 >& rI
}
sal_Int64 nRet = SfxBaseModel::getSomething( rId );
-if ( nRet )
+if (nRet)
return nRet;
-else
-{
-GetNumberFormatter();
-Any aNumTunnel =
xNumFmtAgg->queryAggregation(cppu::UnoType::get());
-Reference xNumTunnel;
-aNumTunnel >>= xNumTunnel;
-if(xNumTunnel.is())
-return xNumTunnel->getSomething(rId);
-}
-return SfxBaseModel::getSomething( rId );
+GetNumberFormatter();
+if (!xNumFmtAgg.is()) // may happen if not valid or no SwDoc
+return 0;
+Any aNumTunnel =
xNumFmtAgg->queryAggregation(cppu::UnoType::get());
+Reference xNumTunnel;
+aNumTunnel >>= xNumTunnel;
+return (xNumTunnel.is()) ? xNumTunnel->getSomething(rId) : 0;
}
Any SAL_CALL SwXTextDocument::queryInterface( const uno::Type& rType )
throw(RuntimeException, std::exception)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/update_pch.sh
bin/update_pch.sh | 12
1 file changed, 12 insertions(+)
New commits:
commit 0c32c2133e3be1ddbc719772007ba3833d2bb848
Author: Ashod Nakashian
Date: Sun Mar 8 19:21:57 2015 -0400
Parallelized update precompiled headers.
Each pch file is updated independently from the others,
giving an opportunity to execute the update logic in parallel.
The script uses xargs to run the update script in parallel.
The total execution on my particular rig was reduced from
~420 minutes to under 75 mins, using 24 threads on Evo 850 SSD.
Change-Id: Ifeb3947e756325756eb786e3025155481da1ea41
Reviewed-on: https://gerrit.libreoffice.org/14802
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/bin/update_pch.sh b/bin/update_pch.sh
index 61f0c6d..9f423d6 100755
--- a/bin/update_pch.sh
+++ b/bin/update_pch.sh
@@ -8,6 +8,7 @@
#
# Usage: update_pch.sh [precompiled_xxx.hxx]
+# Invoke: make cmd cmd="./bin/update_pch.sh [..]"
root=`dirname $0`
root=`cd $root/.. && pwd`
@@ -18,6 +19,17 @@ else
headers="$1"
fi
+# Split the headers into an array.
+IFS=' ' read -a aheaders <<< $headers
+hlen=${#aheaders[@]};
+if [ $hlen -gt 1 ]; then
+if [ -z "$PARALLELISM" ]; then
+PARALLELISM=0 # Let xargs decide
+fi
+echo $headers | xargs -n 1 -P $PARALLELISM $0
+exit $?
+fi
+
for x in $headers; do
header=$x
echo updating `echo $header | sed -e s%$root/%%`
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/CppunitTest_sc_condformats.mk sc/inc sc/qa sc/source
sc/CppunitTest_sc_condformats.mk |2
sc/inc/drwlayer.hxx | 14
sc/inc/sc.hrc|5 +
sc/qa/extras/sccondformats.cxx | 110 +++
sc/source/core/data/drwlayer.cxx | 43 +++
sc/source/ui/src/scstring.src| 10 +++
sc/source/ui/view/drawvie3.cxx | 10 +++
7 files changed, 194 insertions(+)
New commits:
commit bff29a3b30c8e57ab78937dca862fd738f26d89e
Author: Henry Castro
Date: Fri Feb 13 20:22:04 2015 -0400
tdf#51460 Calc fails to set undo step after changing image anchor mode
Fixed. Note that the undo button is still grayed out. Calc has not set an
undo step.
Change-Id: I7ff713a906b365b460351e5202161c9152542395
Reviewed-on: https://gerrit.libreoffice.org/14489
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/CppunitTest_sc_condformats.mk b/sc/CppunitTest_sc_condformats.mk
index 0ee259e..799306a 100644
--- a/sc/CppunitTest_sc_condformats.mk
+++ b/sc/CppunitTest_sc_condformats.mk
@@ -33,6 +33,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_condformats, \
salhelper \
sax \
sb \
+ sc \
+ scqahelper \
sfx \
sot \
subsequenttest \
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index 6917c2a..4d355b9 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -76,6 +76,20 @@ public:
virtual void Redo() SAL_OVERRIDE;
};
+class ScUndoAnchorData : public SdrUndoObj
+{
+private:
+boolmbWasCellAnchored;
+ScDocument* mpDoc;
+SCTAB mnTab;
+public:
+ScUndoAnchorData( SdrObject* pObj, ScDocument* pDoc, SCTAB
nTab );
+virtual ~ScUndoAnchorData();
+
+virtual void Undo() SAL_OVERRIDE;
+virtual void Redo() SAL_OVERRIDE;
+};
+
class SC_DLLPUBLIC ScDrawLayer : public FmFormModel
{
private:
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index f76a45a..242d8e8 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -908,6 +908,11 @@
#define STR_CELL(STR_START + 219)
#define STR_CONTENT (STR_START + 220)
+// Undo Anchor
+
+#define SCSTR_UNDO_PAGE_ANCHOR (STR_START + 221)
+#define SCSTR_UNDO_CELL_ANCHOR (STR_START + 222)
+
// navigator - in the same order as SC_CONTENT_...
#define SCSTR_CONTENT_ROOT (STR_START + 250)
#define SCSTR_CONTENT_TABLE (STR_START + 251)
diff --git a/sc/qa/extras/sccondformats.cxx b/sc/qa/extras/sccondformats.cxx
index 4a664c4..8b6f666 100644
--- a/sc/qa/extras/sccondformats.cxx
+++ b/sc/qa/extras/sccondformats.cxx
@@ -8,6 +8,9 @@
*/
#include
+#include
+#include
+#include
#include
#include
@@ -17,6 +20,11 @@
#include
#include
+#include "tabvwsh.hxx"
+#include "docsh.hxx"
+
+#include "sc.hrc"
+
using namespace css;
namespace sc_apitest {
@@ -33,9 +41,11 @@ public:
uno::Reference< uno::XInterface > init();
void testCondFormat();
+void testUndoAnchor();
CPPUNIT_TEST_SUITE(ScConditionalFormatTest);
CPPUNIT_TEST(testCondFormat);
+CPPUNIT_TEST(testUndoAnchor);
CPPUNIT_TEST_SUITE_END();
private:
@@ -110,6 +120,106 @@ void ScConditionalFormatTest::testCondFormat()
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xSheetConditionalEntries->getCount());
}
+void ScConditionalFormatTest::testUndoAnchor()
+{
+const OString sFailedMessage = OString("Failed on :");
+OUString aFileURL;
+createFileURL(OUString("document_with_linked_graphic.ods"), aFileURL);
+// open the document with graphic included
+uno::Reference< com::sun::star::lang::XComponent > xComponent =
loadFromDesktop(aFileURL);
+CPPUNIT_ASSERT(xComponent.is());
+
+// Get the document model
+SfxObjectShell* pFoundShell =
SfxObjectShell::GetShellFromComponent(xComponent);
+CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
+
+ScDocShell* xDocSh = dynamic_cast(pFoundShell);
+CPPUNIT_ASSERT(xDocSh != NULL);
+
+// Check whether graphic imported well
+ScDocument& rDoc = xDocSh->GetDocument();
+ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer();
+CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pDrawLayer != NULL );
+
+const SdrPage *pPage = pDrawLayer->GetPage(0);
+CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pPage != NULL );
+
+SdrGrafObj* pObject = dynamic_cast(pPage->GetObj(0));
+CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pObject != NULL );
+CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(),
pObject->IsLinkedGraphic() );
+
+const GraphicObject& rGraphicObj = pObject->GetGraphicObject(true);
+CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(),
!rGraphicObj.IsSwappedOut());
+CPPUNIT_ASSERT_EQUAL_MESSAGE( sFailedMessage.getStr(), GRAPHIC_BITMAP,
rGraphicObj.GetGraphic().GetType());
+CPPUNIT_ASSERT_EQUAL_MESSAGE( sFailedMessage.getStr(), sal_uLong(864900),
rGraphicObj.GetSizeBytes());
+
+// Get the document c
[Libreoffice-commits] core.git: sw/source
sw/source/ui/index/cnttab.cxx | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) New commits: commit 1038a323fb407bcc514426a2fb9e251216d37399 Author: Caolán McNamara Date: Fri Apr 3 09:03:03 2015 +0100 Resolves: tdf#89785 drop down list sizes locked in too early get initial size request after language and sort lists have been filled. We should really queue_resize in list/combo boxes if the StateChanged::DATA gets emitted for them. But we're mostly gotten away with it so far. Change-Id: I37137365e8e71b8f803977edaf46d6c7cfb3fcc2 diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 5361bcd..db7c1b3 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -824,16 +824,17 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& r get(m_pLanguageLB, "lang"); get(m_pSortAlgorithmLB, "keytype"); -//Default mode is arranged to be the tallest mode -//of alphabetical index, lock that height in now -Size aPrefSize(get_preferred_size()); -set_height_request(aPrefSize.Height()); - pIndexEntryWrapper = new IndexEntrySupplierWrapper(); m_pLanguageLB->SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, false, false, false ); +//Default mode is arranged to be the tallest mode +//of alphabetical index, lock that height in now +LanguageHdl(0); //fill sort algorithm list +Size aPrefSize(get_preferred_size()); +set_height_request(aPrefSize.Height()); + sAddStyleContent = m_pAddStylesCB->GetText(); ResStringArray& rNames = aFromNames.GetNames(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/ba431cd20a8a4a97720884487b3f943c55685ac1/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - libreofficekit/source
libreofficekit/source/gtk/lokdocview.cxx | 208 ---
1 file changed, 108 insertions(+), 100 deletions(-)
New commits:
commit 43f5f1cbaaa85352c4e2a345988fbdbd4379f206
Author: Miklos Vajna
Date: Fri Apr 3 10:19:16 2015 +0200
lokdocview: move callback handling to LOKDocView_Impl
These were the last free functions that passed around a LOKDocView_Impl*
manually just because it was not possible to have them in a C++ class
when lokdocview was C code.
Change-Id: I6229a853336db0e47f7d1ba4687d198e076934a3
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index a323249..b71355e 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -26,7 +26,7 @@
#define G_SOURCE_REMOVE FALSE
#define G_SOURCE_CONTINUE TRUE
#endif
-#ifndef g_info
+#if !GLIB_CHECK_VERSION(2,40,0)
#define g_info(...) g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, __VA_ARGS__)
#endif
@@ -174,6 +174,14 @@ struct LOKDocView_Impl
static std::vector payloadToRectangles(const char* pPayload);
/// Returns the string representation of a LibreOfficeKitCallbackType
enumeration element.
static const char* callbackTypeToString(int nType);
+/// Invoked on the main thread if callbackWorker() requests so.
+static gboolean callback(gpointer pData);
+/// Implementation of the callback handler, invoked by callback();
+gboolean callbackImpl(CallbackData* pCallbackData);
+/// Our LOK callback, runs on the LO thread.
+static void callbackWorker(int nType, const char* pPayload, void* pData);
+/// Implementation of the callback worder handler, invoked by
callbackWorker().
+void callbackWorkerImpl(int nType, const char* pPayload);
};
LOKDocView_Impl::CallbackData::CallbackData(int nType, const std::string&
rPayload, LOKDocView* pDocView)
@@ -853,6 +861,104 @@ const char* LOKDocView_Impl::callbackTypeToString(int
nType)
return 0;
}
+gboolean LOKDocView_Impl::callback(gpointer pData)
+{
+LOKDocView_Impl::CallbackData* pCallback =
static_cast(pData);
+return pCallback->m_pDocView->m_pImpl->callbackImpl(pCallback);
+}
+
+gboolean LOKDocView_Impl::callbackImpl(CallbackData* pCallback)
+{
+switch (pCallback->m_nType)
+{
+case LOK_CALLBACK_INVALIDATE_TILES:
+{
+if (pCallback->m_aPayload != "EMPTY")
+{
+GdkRectangle aRectangle =
LOKDocView_Impl::payloadToRectangle(pCallback->m_aPayload.c_str());
+renderDocument(&aRectangle);
+}
+else
+renderDocument(0);
+}
+break;
+case LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR:
+{
+m_aVisibleCursor =
LOKDocView_Impl::payloadToRectangle(pCallback->m_aPayload.c_str());
+m_bCursorOverlayVisible = true;
+gtk_widget_queue_draw(GTK_WIDGET(m_pEventBox));
+}
+break;
+case LOK_CALLBACK_TEXT_SELECTION:
+{
+m_aTextSelectionRectangles =
LOKDocView_Impl::payloadToRectangles(pCallback->m_aPayload.c_str());
+
+// In case the selection is empty, then we get no
LOK_CALLBACK_TEXT_SELECTION_START/END events.
+if (m_aTextSelectionRectangles.empty())
+{
+memset(&m_aTextSelectionStart, 0, sizeof(m_aTextSelectionStart));
+memset(&m_aHandleStartRect, 0, sizeof(m_aHandleStartRect));
+memset(&m_aTextSelectionEnd, 0, sizeof(m_aTextSelectionEnd));
+memset(&m_aHandleEndRect, 0, sizeof(m_aHandleEndRect));
+}
+else
+memset(&m_aHandleMiddleRect, 0, sizeof(m_aHandleMiddleRect));
+gtk_widget_queue_draw(GTK_WIDGET(m_pEventBox));
+}
+break;
+case LOK_CALLBACK_TEXT_SELECTION_START:
+{
+m_aTextSelectionStart =
LOKDocView_Impl::payloadToRectangle(pCallback->m_aPayload.c_str());
+}
+break;
+case LOK_CALLBACK_TEXT_SELECTION_END:
+{
+m_aTextSelectionEnd =
LOKDocView_Impl::payloadToRectangle(pCallback->m_aPayload.c_str());
+}
+break;
+case LOK_CALLBACK_CURSOR_VISIBLE:
+{
+m_bCursorVisible = pCallback->m_aPayload == "true";
+}
+break;
+case LOK_CALLBACK_GRAPHIC_SELECTION:
+{
+if (pCallback->m_aPayload != "EMPTY")
+m_aGraphicSelection =
LOKDocView_Impl::payloadToRectangle(pCallback->m_aPayload.c_str());
+else
+memset(&m_aGraphicSelection, 0, sizeof(m_aGraphicSelection));
+gtk_widget_queue_draw(GTK_WIDGET(m_pEventBox));
+}
+break;
+case LOK_CALLBACK_HYPERLINK_CLICKED:
+{
+GError* pError = NULL;
+gtk_show_uri(NULL, pCallback->m_aPayload.c_str(), GDK_CURRENT_TIME,
&pError);
+}
+break;
+default:
+g_assert(false);
+break;
+}
+delete pCallback;
+
+return G_SOURCE_REMOVE;
+}
+
+void LOKDocView_Impl::callbackWorker(int nType, const char* pPayload, void*
pData)
+{
+LOKDocView* pDocView = static_cast(pData);
+
Re: Information about our work on Libreoffice
On Wed, 2015-03-11 at 17:54 +0100, Tobias Madl wrote: > That is all I can think of atm. One last request of mine would be, > that if someone discovers some weird behavior or some windows, that > are not loading or flicker, please contact me and I will look over it > and try to fix it. writer: insert->index and tables->index and tables. The button area isn't drawn correctly for some reason. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/undo/docundo.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b7bc6e5486dd0f9006c33d03634952a9337da0f3 Author: Caolán McNamara Date: Fri Apr 3 10:30:51 2015 +0100 use UNDO_EMPTY instead of bare 0 Change-Id: Ida0b34a28b30eb9b3bab6b1b6a8112eb1c427c67 diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx index 63cc4b0..ea020b7 100644 --- a/sw/source/core/undo/docundo.cxx +++ b/sw/source/core/undo/docundo.cxx @@ -195,7 +195,7 @@ UndoManager::StartUndo(SwUndoId const i_eUndoId, return UNDO_EMPTY; } -SwUndoId const eUndoId( (0 == i_eUndoId) ? UNDO_START : i_eUndoId ); +SwUndoId const eUndoId( (i_eUndoId == UNDO_EMPTY) ? UNDO_START : i_eUndoId ); OSL_ASSERT(UNDO_END != eUndoId); OUString comment( (UNDO_START == eUndoId) @@ -220,7 +220,7 @@ UndoManager::EndUndo(SwUndoId const i_eUndoId, SwRewriter const*const pRewriter) return UNDO_EMPTY; } -SwUndoId const eUndoId( ((0 == i_eUndoId) || (UNDO_START == i_eUndoId)) +SwUndoId const eUndoId( ((i_eUndoId == UNDO_EMPTY) || (UNDO_START == i_eUndoId)) ? UNDO_END : i_eUndoId ); OSL_ENSURE(!((UNDO_END == eUndoId) && pRewriter), "EndUndo(): no Undo ID, but rewriter given?"); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unotools/source
unotools/source/config/moduleoptions.cxx | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
New commits:
commit f9ac035b81ca21695e94e5ced831dca83cd5a1ec
Author: Julien Nabet
Date: Wed Apr 1 23:08:31 2015 +0200
Fix "unknown factory" log, declare and use FACTORYNAME_BASIC
Also use FACTORYNAME_STARTMODULE in
SvtModuleOptions::ClassifyFactoryByServiceName
Change-Id: I1ab87f13a9a1d071bf6abaae137fc6470101d711
Reviewed-on: https://gerrit.libreoffice.org/15113
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/unotools/source/config/moduleoptions.cxx
b/unotools/source/config/moduleoptions.cxx
index 679e01a..24df404 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -80,8 +80,9 @@
#define FACTORYNAME_CHART "com.sun.star.chart2.ChartDocument"
#define FACTORYNAME_DATABASE
"com.sun.star.sdb.OfficeDatabaseDocument"
#define FACTORYNAME_STARTMODULE "com.sun.star.frame.StartModule"
+#define FACTORYNAME_BASIC "com.sun.star.script.BasicIDE"
-#define FACTORYCOUNT10
+#define FACTORYCOUNT11
/*-
@descr This struct hold information about one factory. We declare a
complete array which can hold infos
@@ -788,6 +789,12 @@ bool SvtModuleOptions_Impl::ClassifyFactoryByName( const
OUString& sName, SvtMod
eFactory = SvtModuleOptions::E_STARTMODULE;
bState = ( sName == FACTORYNAME_STARTMODULE);
}
+// no else!
+if( !bState )
+{
+eFactory = SvtModuleOptions::E_BASIC;
+bState = ( sName == FACTORYNAME_BASIC);
+}
return bState;
}
@@ -1135,6 +1142,10 @@ SvtModuleOptions::EFactory
SvtModuleOptions::ClassifyFactoryByServiceName(const
return E_CHART;
if (sName == FACTORYNAME_DATABASE)
return E_DATABASE;
+if (sName == FACTORYNAME_STARTMODULE)
+return E_STARTMODULE;
+if (sName == FACTORYNAME_BASIC)
+return E_BASIC;
return E_UNKNOWN_FACTORY;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - cui/source
cui/source/tabpages/tpshadow.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 7f80b3eb26769143e18806392164aae8c5ad9763 Author: Katarina Behrens Date: Wed Apr 1 23:25:34 2015 +0200 Follow-up tdf#84288: call SetRectangleAttributes only once cherry-picking code from master (4.5) branch to 4.4 branch sadly didn't remove/replace the faulty m_pCtlXRectPreview->SetRectangleAttributes line b/c 4.4 code calls it a bit earlier. I noticed too late and dtardon was too quick with merging. Change-Id: Ib6e43c4475aacd5d87d9b82f321c24386187b736 Reviewed-on: https://gerrit.libreoffice.org/15114 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 3216853..3e33839 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -210,7 +210,6 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet ) } } -m_pCtlXRectPreview->SetRectangleAttributes(rSet); // aLbShadowColor nPos = m_pLbShadowColor->GetSelectEntryPos(); m_pLbShadowColor->Clear(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source
sw/source/ui/index/cnttab.cxx | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) New commits: commit e80a94284be2e73526d41fc6be99c7255f4c2ca3 Author: Caolán McNamara Date: Fri Apr 3 09:03:03 2015 +0100 Resolves: tdf#89785 drop down list sizes locked in too early get initial size request after language and sort lists have been filled. We should really queue_resize in list/combo boxes if the StateChanged::DATA gets emitted for them. But we're mostly gotten away with it so far. Change-Id: I37137365e8e71b8f803977edaf46d6c7cfb3fcc2 (cherry picked from commit 1038a323fb407bcc514426a2fb9e251216d37399) Reviewed-on: https://gerrit.libreoffice.org/15134 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 70b06ab..c0065b7 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -824,16 +824,17 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& r get(m_pLanguageLB, "lang"); get(m_pSortAlgorithmLB, "keytype"); -//Default mode is arranged to be the tallest mode -//of alphabetical index, lock that height in now -Size aPrefSize(get_preferred_size()); -set_height_request(aPrefSize.Height()); - pIndexEntryWrapper = new IndexEntrySupplierWrapper(); m_pLanguageLB->SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, false, false, false ); +//Default mode is arranged to be the tallest mode +//of alphabetical index, lock that height in now +LanguageHdl(0); //fill sort algorithm list +Size aPrefSize(get_preferred_size()); +set_height_request(aPrefSize.Height()); + sAddStyleContent = m_pAddStylesCB->GetText(); ResStringArray& rNames = aFromNames.GetNames(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/app/docst.cxx | 32 ++--
1 file changed, 30 insertions(+), 2 deletions(-)
New commits:
commit 39f306df1d5f8daa4747f1e3b26e853c001669f5
Author: Caolán McNamara
Date: Fri Apr 3 11:19:10 2015 +0100
Resolves: tdf#90099 group new style and change style together as one undo
Change-Id: I978f503fabce69bb08a892c47d07ff8fa43c73b5
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index 7e78fd0..a5f8835 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -632,8 +632,17 @@ sal_uInt16 SwDocShell::Edit(
sal_uInt16 nRet = nMask;
bool bModified = m_pDoc->getIDocumentState().IsModified();
+SwUndoId nNewStyleUndoId(UNDO_EMPTY);
+
if( bNew )
{
+if (!bBasic)
+{
+// start undo action in order to get only one undo action for the
+// UI new style + change style operations
+m_pWrtShell->StartUndo();
+}
+
if( SFXSTYLEBIT_ALL != nMask && SFXSTYLEBIT_ALL_VISIBLE != nMask &&
SFXSTYLEBIT_USED != nMask )
nMask |= SFXSTYLEBIT_USERDEF;
else
@@ -720,6 +729,13 @@ sal_uInt16 SwDocShell::Edit(
}
break;
}
+
+if (!bBasic)
+{
+//Get the undo id for the type of style that was created in order
to re-use that comment for the grouped
+//create style + change style operations
+m_pWrtShell->GetLastUndoInfo(0, &nNewStyleUndoId);
+}
}
else
{
@@ -784,11 +800,23 @@ sal_uInt16 SwDocShell::Edit(
ApplyStyle aApplyStyleHelper(*this, bNew, pStyle, nRet, xTmp, nFamily,
pDlg.get(), m_xBasePool, bModified);
pDlg->SetApplyHdl(LINK(&aApplyStyleHelper, ApplyStyle, ApplyHdl));
-if (RET_OK == pDlg->Execute())
+short nDlgRet = pDlg->Execute();
+
+if (RET_OK == nDlgRet)
{
aApplyStyleHelper.apply();
}
-else
+
+if (bNew)
+{
+SwRewriter aRewriter;
+aRewriter.AddRule(UndoArg1, xTmp->GetName());
+//Group the create style and change style operations together
under the
+//one "create style" comment
+m_pWrtShell->EndUndo(nNewStyleUndoId, &aRewriter);
+}
+
+if (RET_OK != nDlgRet)
{
if( bNew )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 5 commits - android/experimental
android/experimental/LOAndroid3/res/layout/text_selection_handles.xml
| 24 ---
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandle.java
|2
android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/TextCursorLayer.java
|3
android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/TextCursorView.java
| 75 +-
4 files changed, 45 insertions(+), 59 deletions(-)
New commits:
commit 27c1798ee8ab1178bbef44aea7ee7ce6b7c26a09
Author: Tomaž Vajngerl
Date: Fri Apr 3 18:25:40 2015 +0900
android: remove unneeded layerView stuff
Change-Id: Ide81f4b5dd7f71a3dda21ff51d02a12d7fe9a315
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandle.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandle.java
index bcf22b5..38b5dc1 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandle.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandle.java
@@ -14,8 +14,8 @@ public abstract class SelectionHandle extends BitmapHandle {
private static final long MINIMUM_HANDLE_UPDATE_TIME = 50 * 100;
private final PointF mDragStartPoint = new PointF();
-private long mLastTime = 0;
private final PointF mDragDocumentPosition = new PointF();
+private long mLastTime = 0;
public SelectionHandle(Bitmap bitmap) {
super(bitmap);
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/TextCursorView.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/TextCursorView.java
index 74a0dc3..44d0d51 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/TextCursorView.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/TextCursorView.java
@@ -127,15 +127,9 @@ public class TextCursorView extends View implements
View.OnTouchListener {
* @param selectionRects - list of text selection rectangles
*/
public void changeSelections(List selectionRects) {
-LayerView layerView = LOKitShell.getLayerView();
-if (layerView == null) {
-Log.e(LOGTAG, "Can't position selections because layerView is
null");
-return;
-}
-
mSelections = selectionRects;
-ImmutableViewportMetrics metrics = layerView.getViewportMetrics();
+ImmutableViewportMetrics metrics = mLayerView.getViewportMetrics();
repositionWithViewport(metrics.viewportRectLeft,
metrics.viewportRectTop, metrics.zoomFactor);
}
@@ -147,15 +141,10 @@ public class TextCursorView extends View implements
View.OnTouchListener {
if (RectUtils.fuzzyEquals(mGraphicSelection.mRectangle, rectangle)) {
return;
}
-LayerView layerView = LOKitShell.getLayerView();
-if (layerView == null) {
-Log.e(LOGTAG, "Can't position selections because layerView is
null");
-return;
-}
mGraphicSelection.mRectangle = rectangle;
-ImmutableViewportMetrics metrics = layerView.getViewportMetrics();
+ImmutableViewportMetrics metrics = mLayerView.getViewportMetrics();
repositionWithViewport(metrics.viewportRectLeft,
metrics.viewportRectTop, metrics.zoomFactor);
}
@@ -348,10 +337,6 @@ public class TextCursorView extends View implements
View.OnTouchListener {
return false;
}
-public void setLayerView(LayerView layerView) {
-this.mLayerView = layerView;
-}
-
public void positionHandle(SelectionHandle.HandleType type, RectF
position) {
SelectionHandle handle = getHandleForType(type);
if (RectUtils.fuzzyEquals(handle.mDocumentPosition, position)) {
commit 6a3bbbca6280d1e27126b8fa5488a4130e622840
Author: Tomaž Vajngerl
Date: Fri Apr 3 18:23:45 2015 +0900
android: don't modify if the value is same - all in TextCursorView
Change-Id: Ia90458ca037959c07244673fc5521fb940737390
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/TextCursorView.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/TextCursorView.java
index 389cc39..74a0dc3 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/TextCursorView.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/TextCursorView.java
@@ -113,6 +113,9 @@ public class TextCursorView extends View implements
View.OnTouchListener {
* @param position - new position of the cursor
*/
public void changeCursorPosition(RectF position) {
+if (RectUtils.fuzzyEquals(mCursorPosition, position)) {
+return;
+}
mCursorPosition = position;
ImmutableViewportMetrics metrics = mLayerView.getViewportMetrics();
@@ -141,6 +144,9 @@ public class TextCursorView extends View implements
View.OnTouchList
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - desktop/source include/vcl sc/inc sc/source sd/source sw/inc sw/source
desktop/source/lib/init.cxx | 21 +++--
include/vcl/ITiledRenderable.hxx |7 +++
sc/inc/docuno.hxx |3 +++
sc/source/ui/inc/gridwin.hxx |2 +-
sc/source/ui/unoobj/docuno.cxx| 28
sd/source/ui/inc/Window.hxx |2 +-
sd/source/ui/inc/unomodel.hxx |2 ++
sd/source/ui/unoidl/unomodel.cxx | 28
sw/inc/unotxdoc.hxx |2 ++
sw/source/uibase/inc/edtwin.hxx |2 +-
sw/source/uibase/uno/unotxdoc.cxx | 21 +
11 files changed, 101 insertions(+), 17 deletions(-)
New commits:
commit 4ab968500f911f37d2a620c5576e21546cf9b885
Author: Miklos Vajna
Date: Fri Apr 3 12:29:28 2015 +0200
LOK: reimplement lok::Document::postKeyEvent()
Instead of posting an event to the main loop of the soffice thread, do
what every other methods do: take the solar mutex and execute the task
on the thread. This fixes random lost/delayed key events on Android.
Change-Id: Ibe819282b5f3bb64e44d4b6f0a92611fe651bb39
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index bdab485..7d502af 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -687,23 +687,16 @@ static void doc_registerCallback(LibreOfficeKitDocument*
pThis,
pDoc->registerCallback(pCallback, pData);
}
-static void doc_postKeyEvent(LibreOfficeKitDocument* /*pThis*/, int nType, int
nCharCode, int nKeyCode)
+static void doc_postKeyEvent(LibreOfficeKitDocument* pThis, int nType, int
nCharCode, int nKeyCode)
{
-#if defined(UNX) && !defined(MACOSX) && !defined(ENABLE_HEADLESS)
-if (SalFrame *pFocus = GetSvpFocusFrameForLibreOfficeKit())
+ITiledRenderable* pDoc = getTiledRenderable(pThis);
+if (!pDoc)
{
-KeyEvent aEvent(nCharCode, nKeyCode, 0);
-switch (nType)
-{
-case LOK_KEYEVENT_KEYINPUT:
-Application::PostKeyEvent(VCLEVENT_WINDOW_KEYINPUT,
GetSalFrameWindowForLibreOfficeKit(pFocus), &aEvent);
-break;
-case LOK_KEYEVENT_KEYUP:
-Application::PostKeyEvent(VCLEVENT_WINDOW_KEYUP,
GetSalFrameWindowForLibreOfficeKit(pFocus), &aEvent);
-break;
-}
+gImpl->maLastExceptionMsg = "Document doesn't support tiled rendering";
+return;
}
-#endif
+
+pDoc->postKeyEvent(nType, nCharCode, nKeyCode);
}
static void doc_postUnoCommand(LibreOfficeKitDocument* /*pThis*/, const char*
pCommand)
diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index a10e448..5cac9b6 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -101,6 +101,13 @@ public:
virtual void registerCallback(LibreOfficeKitCallback pCallback, void*
pData) = 0;
/**
+ * Posts a keyboard event on the document.
+ *
+ * @see lok::Document::postKeyEvent().
+ */
+virtual void postKeyEvent(int nType, int nCharCode, int nKeyCode) = 0;
+
+/**
* Posts a mouse event on the document.
*
* @see lok::Document::postMouseEvent().
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 5642569..0e58087 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -394,6 +394,9 @@ public:
/// @see vcl::ITiledRenderable::registerCallback().
virtual void registerCallback(LibreOfficeKitCallback pCallback, void*
pData) SAL_OVERRIDE;
+/// @see vcl::ITiledRenderable::postKeyEvent().
+virtual void postKeyEvent(int nType, int nCharCode, int nKeyCode)
SAL_OVERRIDE;
+
/// @see vcl::ITiledRenderable::postMouseEvent().
virtual void postMouseEvent(int nType, int nX, int nY, int nCount)
SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 9d8965d..259844e 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -287,7 +287,6 @@ class ScGridWindow : public vcl::Window, public
DropTargetHelper, public DragSou
protected:
virtual voidPrePaint() SAL_OVERRIDE;
virtual voidPaint( const Rectangle& rRect ) SAL_OVERRIDE;
-virtual voidKeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE;
virtual voidGetFocus() SAL_OVERRIDE;
virtual voidLoseFocus() SAL_OVERRIDE;
@@ -304,6 +303,7 @@ public:
ScGridWindow( vcl::Window* pParent, ScViewData* pData, ScSplitPos
eWhichPos );
virtual ~ScGridWindow();
+virtual voidKeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE;
// #i70788# flush and get overlay
rtl::Reference getOverlayManager();
void flushOverlayManager();
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 16e83e0..3ee089a 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -528,6 +528,34 @@ void ScModelObj::registerCallback(LibreOfficeKitCallback
pCallback, void* pData)
pDocShell->GetDocument().GetDrawLayer()->registerLibreOfficeKitC
[Libreoffice-commits] core.git: include/sfx2 sfx2/source sfx2/uiconfig
include/sfx2/dinfdlg.hxx |2 +- sfx2/source/dialog/dinfdlg.cxx |6 +++--- sfx2/uiconfig/ui/documentinfopage.ui |9 +++-- 3 files changed, 7 insertions(+), 10 deletions(-) New commits: commit c8e39299ac4ced2dc72f373526089b9574a14a8a Author: Caolán McNamara Date: Fri Apr 3 11:50:52 2015 +0100 Resolves: tdf#89885 use a readonly GtkEntry for location Change-Id: I324d5e0776da942eae62984b96951d9947702b49 diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 1e5490d..9179c69 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -185,7 +185,7 @@ private: PushButton* m_pChangePassBtn; SelectableFixedText*m_pShowTypeFT; -FixedText* m_pFileValFt; +Edit* m_pFileValEd; SelectableFixedText*m_pShowSizeFT; SelectableFixedText*m_pCreateValFt; diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 1237d4c..4317295 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -754,7 +754,7 @@ SfxDocumentPage::SfxDocumentPage(vcl::Window* pParent, const SfxItemSet& rItemSe get(m_pChangePassBtn, "changepass"); get(m_pShowTypeFT, "showtype"); -get(m_pFileValFt, "showlocation"); +get(m_pFileValEd, "showlocation"); get(m_pShowSizeFT, "showsize"); m_aUnknownSize = m_pShowSizeFT->GetText(); m_pShowSizeFT->SetText(OUString()); @@ -1028,10 +1028,10 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet ) // we know it's a folder -> don't need the final slash, but it's better for WB_PATHELLIPSIS aPath.removeFinalSlash(); OUString aText( aPath.PathToFileName() ); //! (pb) MaxLen? -m_pFileValFt->SetText( aText ); +m_pFileValEd->SetText( aText ); } else if ( aURL.GetProtocol() != INetProtocol::PrivSoffice ) -m_pFileValFt->SetText( aURL.GetPartBeforeLastName() ); +m_pFileValEd->SetText( aURL.GetPartBeforeLastName() ); // handle access data bool m_bUseUserData = rInfoItem.IsUseUserData(); diff --git a/sfx2/uiconfig/ui/documentinfopage.ui b/sfx2/uiconfig/ui/documentinfopage.ui index 46e1c28..7d75d8a 100644 --- a/sfx2/uiconfig/ui/documentinfopage.ui +++ b/sfx2/uiconfig/ui/documentinfopage.ui @@ -297,13 +297,10 @@ - + True -False -True -0 -True -56 +True +False 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - android/experimental android/README
android/README
|6 +++---
android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java
|4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit db3b5c993c1c4bb20be5bc997e8e6ecd2f176e37
Author: Miklos Vajna
Date: Fri Apr 3 12:58:17 2015 +0200
android: Insure -> Ensure
Change-Id: I33d8282210329d8bb3a471a7c717fcf653930e95
diff --git a/android/README b/android/README
index bd570e9..c0a7e93 100644
--- a/android/README
+++ b/android/README
@@ -77,7 +77,7 @@ Document view classes
- GeckoLayerClient (org.mozilla.gecko.gfx.GeckoLayerClient) is the middle man
of the
application, which connects all the bits together. It is the document view
layer
holder so the any management (including tiled rendering) usually go through
this
- class. It listenes to draw requests and viewport changes from
PanZoomController
+ class. It listens to draw requests and viewport changes from
PanZoomController
(see "Touch events").
Touch events, scrolling and zooming
@@ -128,7 +128,7 @@ For editing there are 2 coarse tasks that the LibreOffice
app must do:
In most cases when an input event happens and is send to the LO core, then a
message from
LO core follows. For example: when the user writes to the keyboard, key event
is sent and
-a invalidation requst from LO core follows. When user touches an image, a
mouse event is
+a invalidation request from LO core follows. When user touches an image, a
mouse event is
sent, and a "new graphic selection" message from LO core follows.
All keyboard and touch events are send to LOKitThread as LOEvents. In
LOKitThread they are
@@ -220,7 +220,7 @@ ERROR: Could not extract package's data directory. Are you
sure that
(gdb) python sys.path.insert(0, "/master/solenv/gdb")
(gdb) source /master/instdir/program/libuno_sal.so.3-gdb.py
-* Debuggint the Java part
+* Debugging the Java part
At the moment the code is not organized in a way that would make Eclipse or
Android Studio happy as-is, so the quickest way is to use the jdb command-line
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java
index 504c2f3..358617f 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java
@@ -28,7 +28,7 @@ public class ToolbarController {
* Change the toolbar to edit mode.
*/
void switchToEditMode() {
-// Insure the change is done on UI thread
+// Ensure the change is done on UI thread
LOKitShell.getMainHandler().post(new Runnable() {
@Override
public void run() {
@@ -44,7 +44,7 @@ public class ToolbarController {
* Change the toolbar to view mode.
*/
void switchToViewMode() {
-// Insure the change is done on UI thread
+// Ensure the change is done on UI thread
LOKitShell.getMainHandler().post(new Runnable() {
@Override
public void run() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Test name: testSectionProtection::Import_Export_Import equality assertion failed (CppunitTest_sw_ooxmlexport5)
I routinely run LO master, compiled from source (because I can). I run Xubuntu 14.04. On my old laptop (which has successfully compiled LO from git for the past year or so), I was getting this error: xmltesttools.cxx:70:Assertion Test name: testSectionProtection::Import_Export_Import equality assertion failed - Expected: 1 - Actual : 2 - In , XPath '//w:formProt[1]' number of nodes is incorrect Failures !!! Run: 106 Failure total: 1 Failures: 1 Errors: 0 Error: a unit test failed, please do one of: export DEBUGCPPUNIT=TRUE# for exception catching export CPPUNITTRACE="gdb --args"# for interactive debugging on Linux export VALGRIND=memcheck# for memory checking and retry using: make CppunitTest_sw_ooxmlexport5 make[1]: *** [/home/fun/libreoffice/workdir/CppunitTest/sw_ooxmlexport5.test] Error 1 make[1]: *** Waiting for unfinished jobs make: *** [build] Error 2 I tried "make clean" (just in case of artifacts messing something up), tried again and it still happened. As it happened I got a new laptop yesterday, fresh Xubuntu, git cloned LO afresh and tried again ... and got the same error. This has been happening since Wednesday evening or so. I presume because it hasn't been fixed that it's not happening for everyone. Is it happening for anyone else? I note this commit by Miklos Vajna, related to this error: http://cgit.freedesktop.org/libreoffice/core/commit/?id=3a54090f1ef4469cf824fcdb22c100c49d2ab7db CppunitTest_sw_ooxmlexport5: try to make MacOSX_37-tdf-buildbot happy Presumably this was to fix the same problem on MacOSX. So ... what's going on with my setup? (I have both laptops here for the weekend and can test stuff.) - d. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/doc.hxx |8 +---
sw/source/core/doc/docnum.cxx|8 +---
sw/source/core/edit/ednumber.cxx | 18 ++
3 files changed, 24 insertions(+), 10 deletions(-)
New commits:
commit db41e274747e6f1d3eee2bd5efb3321cfcbd6b75
Author: Caolán McNamara
Date: Fri Apr 3 12:39:07 2015 +0100
Resolves: tdf#87548 don't create a new list for each multiselection portion
create one list and share it among all the subsections
possibly a regression from/triggered by
author Oliver-Rainer Wittmann 2014-03-18
14:33:39 (GMT)
Resolves: #i124371# When changing the numbering or bullet styling... of a
set
of paragraph which have more than one different List Style applied create
a new
List Style and put the paragraphs into a new list.
(cherry picked from commit 0087ca89e3905009ed947c651f3dc70f3d61ea93)
Change-Id: I9416b97d6afe323ac99150fdcc23f71ecea98a58
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 804534a..f026587 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1106,10 +1106,12 @@ public:
Parameters and :
indicates, if a new list is created by applying the
given list style.
If equals false, may contain the
- list Id of a list, which has to be continued by applying the given list
style */
-void SetNumRule( const SwPaM&,
+ list Id of a list, which has to be continued by applying the given list
style
+
+ Returns the set ListId if bSetItem is true */
+OUString SetNumRule( const SwPaM&,
const SwNumRule&,
- const bool bCreateNewList,
+ bool bCreateNewList,
const OUString& sContinuedListId = OUString(),
bool bSetItem = true,
const bool bResetIndentAttrs = false );
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 0eedcc1..40a35c9 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -816,13 +816,15 @@ static void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule&
rRule )
rDoc.UpdateNumRule();
}
-void SwDoc::SetNumRule( const SwPaM& rPam,
+OUString SwDoc::SetNumRule( const SwPaM& rPam,
const SwNumRule& rRule,
const bool bCreateNewList,
const OUString& sContinuedListId,
bool bSetItem,
const bool bResetIndentAttrs )
{
+OUString sListId;
+
SwUndoInsNum * pUndo = NULL;
if (GetIDocumentUndoRedo().DoesUndo())
{
@@ -856,7 +858,6 @@ void SwDoc::SetNumRule( const SwPaM& rPam,
if ( bSetItem )
{
-OUString sListId;
if ( bCreateNewList )
{
if ( bNewNumRuleCreated )
@@ -935,8 +936,9 @@ void SwDoc::SetNumRule( const SwPaM& rPam,
}
getIDocumentState().SetModified();
-}
+return sListId;
+}
void SwDoc::SetCounted(const SwPaM & rPam, bool bCounted)
{
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index 981881a..c885aac 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -731,8 +731,8 @@ const SwNumRule*
SwEditShell::GetNumRuleAtCurrentSelection() const
}
void SwEditShell::SetCurNumRule( const SwNumRule& rRule,
- const bool bCreateNewList,
- const OUString& sContinuedListId,
+ bool bCreateNewList,
+ const OUString& rContinuedListId,
const bool bResetIndentAttrs )
{
StartAllAction();
@@ -744,19 +744,29 @@ void SwEditShell::SetCurNumRule( const SwNumRule& rRule,
{
SwPamRanges aRangeArr( *pCrsr );
SwPaM aPam( *pCrsr->GetPoint() );
+OUString sContinuedListId(rContinuedListId);
for( sal_uInt16 n = 0; n < aRangeArr.Count(); ++n )
{
aRangeArr.SetPam( n, aPam );
-GetDoc()->SetNumRule( aPam, rRule,
+OUString sListId = GetDoc()->SetNumRule( aPam, rRule,
bCreateNewList, sContinuedListId,
true, bResetIndentAttrs );
+
+//tdf#87548 On creating a new list for a multi-selection only
+//create a single new list for the multi-selection, not one per
selection
+if (bCreateNewList)
+{
+sContinuedListId = sListId;
+bCreateNewList = false;
+}
+
GetDoc()->SetCounted( aPam, true );
}
}
else
{
GetDoc()->SetNumRule( *pCrsr, rRule,
- bCreateNewList, sContinuedListId,
+ bCreateNewList, rContinuedListId,
true, bResetIndentAttrs );
GetDoc()->SetCounted( *pCrsr, tr
Paste working using c# code
Hi, I had just started to use Libre. I want to paste contains of clipboard in "Calc" using c#.net code I tried using XSheetPastable but I am not getting any example for using XSheetPastable. Can some body help me how the code should be? Thanks in advance for your Help. From Vighnahar Mone -- View this message in context: http://nabble.documentfoundation.org/Paste-working-using-c-code-tp4145322.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Test name: testSectionProtection::Import_Export_Import equality assertion failed (CppunitTest_sw_ooxmlexport5)
This appears to be a bug in older versions of the xpath library. I have a patch but I won't get around to committing it until Tuesday. Mstahl may beat me to it :) For now just ignore it. On Friday, 3 April 2015, David Gerard wrote: > I routinely run LO master, compiled from source (because I can). I run > Xubuntu 14.04. > > On my old laptop (which has successfully compiled LO from git for the > past year or so), I was getting this error: > > > xmltesttools.cxx:70:Assertion > Test name: testSectionProtection::Import_Export_Import > equality assertion failed > - Expected: 1 > - Actual : 2 > - In , XPath '//w:formProt[1]' number of > nodes is incorrect > > Failures !!! > Run: 106 Failure total: 1 Failures: 1 Errors: 0 > > Error: a unit test failed, please do one of: > > export DEBUGCPPUNIT=TRUE# for exception catching > export CPPUNITTRACE="gdb --args"# for interactive debugging on Linux > export VALGRIND=memcheck# for memory checking > > and retry using: make CppunitTest_sw_ooxmlexport5 > > make[1]: *** > [/home/fun/libreoffice/workdir/CppunitTest/sw_ooxmlexport5.test] > Error 1 > make[1]: *** Waiting for unfinished jobs > make: *** [build] Error 2 > > > I tried "make clean" (just in case of artifacts messing something up), > tried again and it still happened. > > As it happened I got a new laptop yesterday, fresh Xubuntu, git cloned > LO afresh and tried again ... and got the same error. This has been > happening since Wednesday evening or so. > > I presume because it hasn't been fixed that it's not happening for > everyone. Is it happening for anyone else? > > I note this commit by Miklos Vajna, related to this error: > > > http://cgit.freedesktop.org/libreoffice/core/commit/?id=3a54090f1ef4469cf824fcdb22c100c49d2ab7db > CppunitTest_sw_ooxmlexport5: try to make MacOSX_37-tdf-buildbot happy > > Presumably this was to fix the same problem on MacOSX. > > So ... what's going on with my setup? (I have both laptops here for > the weekend and can test stuff.) > > > - d. > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - accessibility/source
accessibility/source/standard/vclxaccessiblebox.cxx | 22
accessibility/source/standard/vclxaccessiblelist.cxx | 33 ---
2 files changed, 15 insertions(+), 40 deletions(-)
New commits:
commit 74e673b49fdf8daa3365961de5fb0c9c6d831279
Author: Caolán McNamara
Date: Fri Apr 3 15:03:34 2015 +0100
Resolves: tdf#82998 no object:active descendant changed emitted
for listboxes in WB_DROPDOWN mode which means the dropdown exists,
but when the drop down is not activated.
I think it's plausible that there was confusion around "b_IsDropDownList"
and
that the meaning taken by the author was the the dropdown is active if
b_IsDropDownList is set, so renamed that to bHasDropDownList and take the
old
"b_IsDropDownList" path when "b_IsDropDownList && ..IsInDropDown()"
Folded the then both equal code paths of the LISTBOX code together. No idea
if
there should be an additional equivalent
AccessibleEventId::SELECTION_CHANGED
for LISTBOXES like COMBOBOX instead of
AccessibleEventId::ACTIVE_DESCENDANT_CHANGED in the dropdown not active
case.
Change-Id: I6db3ec21b392b7bf1b488235464202bb326f2535
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx
b/accessibility/source/standard/vclxaccessiblelist.cxx
index 31217a2..7fc060b 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -205,7 +205,7 @@ void VCLXAccessibleList::UpdateSelection_Acc (const
::rtl::OUString& sTextOfSele
}
-void VCLXAccessibleList::UpdateSelection_Impl_Acc(bool b_IsDropDownList)
+void VCLXAccessibleList::UpdateSelection_Impl_Acc(bool bHasDropDownList)
{
uno::Any aOldValue, aNewValue;
@@ -261,22 +261,18 @@ void VCLXAccessibleList::UpdateSelection_Impl_Acc(bool
b_IsDropDownList)
if (m_aBoxType == COMBOBOX)
{
-if (b_IsDropDownList)
+//VCLXAccessibleDropDownComboBox
+//when in list is dropped down, xText = NULL
+if (bHasDropDownList && m_pListBoxHelper &&
m_pListBoxHelper->IsInDropDown())
{
-//VCLXAccessibleDropDownComboBox
-//when in list is dropped down, xText = NULL
-if (m_pListBoxHelper && m_pListBoxHelper->IsInDropDown())
+if ( aNewValue.hasValue() || aOldValue.hasValue() )
{
-if ( aNewValue.hasValue() || aOldValue.hasValue() )
-{
-NotifyAccessibleEvent(
-AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
-aOldValue,
-aNewValue );
-
-NotifyListItem(aNewValue);
+NotifyAccessibleEvent(
+AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
+aOldValue,
+aNewValue );
-}
+NotifyListItem(aNewValue);
}
}
else
@@ -287,34 +283,14 @@ void VCLXAccessibleList::UpdateSelection_Impl_Acc(bool
b_IsDropDownList)
}
else if (m_aBoxType == LISTBOX)
{
-if (b_IsDropDownList)
+if ( aNewValue.hasValue() || aOldValue.hasValue() )
{
-//VCLXAccessibleDropdownListBox
-//when in list is dropped down, xText = NULL
-if (m_pListBoxHelper && m_pListBoxHelper->IsInDropDown())
-{
-if ( aNewValue.hasValue() || aOldValue.hasValue() )
-{
-NotifyAccessibleEvent(
-AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
-aOldValue,
-aNewValue );
+NotifyAccessibleEvent(
+AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
+aOldValue,
+aNewValue );
-NotifyListItem(aNewValue);
-}
-}
-}
-else
-{
-if ( aNewValue.hasValue() || aOldValue.hasValue() )
-{
-NotifyAccessibleEvent(
-AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
-aOldValue,
-aNewValue );
-
-NotifyListItem(aNewValue);
-}
+NotifyListItem(aNewValue);
}
}
}
commit da907c7b7a328d29d5ede8d43f539811856417f9
Author: Caolán McNamara
Date: Fri Apr 3 14:55:26 2015 +0100
Related: tdf#82998 rearrange, no logic change
Change-Id: I1d3a6a552bd535622009b43e0633a357b1a919e6
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx
b/accessibility/source/standard/vclxaccessiblelist.cxx
index f9aed93..31217a2 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -258,56 +258,63 @@ void VCLXAccessibleList::UpdateSelection_Impl_Acc(bool
b_IsDropDownList)
}
[Libreoffice-commits] core.git: sw/source
sw/source/core/undo/undobj.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4fe5b44b15647542b1550deaeee43ec3d1e57591
Author: Caolán McNamara
Date: Fri Apr 3 15:39:30 2015 +0100
Resolves: tdf#90138 don't try to save a marks OtherPos if it doesn't have
one
Change-Id: I522a236015c91c0744b3018d3d4e4d6c65ea19ab
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 5f781c3..92fd621 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -756,7 +756,7 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition&
rMark,
if ( *pStt < rAnnotationEndPos && rAnnotationEndPos <=
*pEnd )
{
bSavePos = true;
-bSaveOtherPos = true;
+bSaveOtherPos = pBkmk->IsExpanded(); //tdf#90138,
only save the other pos if there is one
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sd/qa
sd/qa/unit/tiledrendering/tiledrendering.cxx | 42 +++
1 file changed, 36 insertions(+), 6 deletions(-)
New commits:
commit dee3e28a87e10e413ea3ae5e1b830e9b4b2c8df9
Author: Miklos Vajna
Date: Fri Apr 3 16:52:44 2015 +0200
Add SdXImpressDocument::setTextSelection() testcase.
Also, avoid early dispose in testRegisterCallback(), that was just a
hack as I did not find SdrBeginTextEdit().
Change-Id: Ic0576306297b4081979c2409c376867c7f530e2c
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 7356a7c..0a4665c 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -38,11 +38,13 @@ public:
void testRegisterCallback();
void testPostMouseEvent();
+void testSetTextSelection();
CPPUNIT_TEST_SUITE(SdTiledRenderingTest);
#if !defined(WNT) && !defined(MACOSX)
CPPUNIT_TEST(testRegisterCallback);
CPPUNIT_TEST(testPostMouseEvent);
+CPPUNIT_TEST(testSetTextSelection);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -109,16 +111,16 @@ void SdTiledRenderingTest::callbackImpl(int nType, const
char* pPayload)
void SdTiledRenderingTest::testRegisterCallback()
{
-// Tests sd::Window::LogicInvalidate().
SdXImpressDocument* pXImpressDocument = createDoc("dummy.odp");
pXImpressDocument->registerCallback(&SdTiledRenderingTest::callback, this);
sd::ViewShell* pViewShell =
pXImpressDocument->GetDocShell()->GetViewShell();
-// Append a character to the empty title shape.
-vcl::KeyCode aKeyCode(0, 0);
-KeyEvent aKeyEvent(static_cast('x'), aKeyCode, 0);
-pViewShell->KeyInput(aKeyEvent, 0);
-mxComponent->dispose();
+// Start text edit of the empty title shape.
+SdPage* pActualPage = pViewShell->GetActualPage();
+SdrObject* pObject = pActualPage->GetObj(0);
+SdrView* pView = pViewShell->GetView();
+pView->SdrBeginTextEdit(pObject);
+CPPUNIT_ASSERT(pView->GetTextEditObject());
// Check that the top left 256x256px tile would be invalidated.
CPPUNIT_ASSERT(!m_aInvalidation.IsEmpty());
@@ -153,6 +155,34 @@ void SdTiledRenderingTest::testPostMouseEvent()
CPPUNIT_ASSERT_EQUAL(static_cast(0),
rEditView.GetSelection().nStartPos);
}
+void SdTiledRenderingTest::testSetTextSelection()
+{
+SdXImpressDocument* pXImpressDocument = createDoc("dummy.odp");
+uno::Reference
xDrawPage(pXImpressDocument->getDrawPages()->getByIndex(0), uno::UNO_QUERY);
+uno::Reference xShape(xDrawPage->getByIndex(0),
uno::UNO_QUERY);
+xShape->setString("Aaa bbb.");
+// Create a selection on the second word.
+sd::ViewShell* pViewShell =
pXImpressDocument->GetDocShell()->GetViewShell();
+SdPage* pActualPage = pViewShell->GetActualPage();
+SdrObject* pObject = pActualPage->GetObj(0);
+SdrView* pView = pViewShell->GetView();
+pView->SdrBeginTextEdit(pObject);
+CPPUNIT_ASSERT(pView->GetTextEditObject());
+EditView& rEditView = pView->GetTextEditOutlinerView()->GetEditView();
+ESelection aWordSelection(0, 4, 0, 7);
+rEditView.SetSelection(aWordSelection);
+// Did we indeed manage to select the second word?
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), rEditView.GetSelected());
+
+// Now use setTextSelection() to move the end of the selection 1000 twips
right.
+vcl::Cursor* pCursor = rEditView.GetCursor();
+Point aEnd = pCursor->GetPos();
+aEnd.setX(aEnd.getX() + 1000);
+pXImpressDocument->setTextSelection(LOK_SETTEXTSELECTION_END, aEnd.getX(),
aEnd.getY());
+// The new selection must include the ending dot, too -- but not the first
word.
+CPPUNIT_ASSERT_EQUAL(OUString("bbb."), rEditView.GetSelected());
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdTiledRenderingTest);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 4 commits - sc/source svx/README
sc/source/ui/unoobj/docuno.cxx |4 +-
sc/source/ui/view/gridwin.cxx |1
svx/README | 57 +
3 files changed, 60 insertions(+), 2 deletions(-)
New commits:
commit edb2d3388c40c8afd168561e7d388c40bb8a2254
Author: Jan Holesovsky
Date: Fri Apr 3 17:12:42 2015 +0200
sc tiled editing: This correction is not needed, pass the exact values.
Change-Id: Ie73569bf3faefdc9aa6a309423d8048a49dda272
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 3ee089a..7c3bb1b 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -685,13 +685,13 @@ void ScModelObj::setGraphicSelection(int nType, int nX,
int nY)
{
MouseEvent aClickEvent(Point(nPixelX, nPixelY), 1,
MouseEventModifiers::SIMPLECLICK, MOUSE_LEFT);
pGridWindow->MouseButtonDown(aClickEvent);
-MouseEvent aMoveEvent(Point(nPixelX + 1, nPixelY), 0,
MouseEventModifiers::SIMPLEMOVE, MOUSE_LEFT);
+MouseEvent aMoveEvent(Point(nPixelX, nPixelY), 0,
MouseEventModifiers::SIMPLEMOVE, MOUSE_LEFT);
pGridWindow->MouseMove(aMoveEvent);
}
break;
case LOK_SETGRAPHICSELECTION_END:
{
-MouseEvent aMoveEvent(Point(nPixelX - 1, nPixelY), 0,
MouseEventModifiers::SIMPLEMOVE, MOUSE_LEFT);
+MouseEvent aMoveEvent(Point(nPixelX, nPixelY), 0,
MouseEventModifiers::SIMPLEMOVE, MOUSE_LEFT);
pGridWindow->MouseMove(aMoveEvent);
MouseEvent aClickEvent(Point(nPixelX, nPixelY), 1,
MouseEventModifiers::SIMPLECLICK, MOUSE_LEFT);
pGridWindow->MouseButtonUp(aClickEvent);
commit af9246cf8935d43cc3ca783e8c1da53b773783c2
Author: Jan Holesovsky
Date: Fri Apr 3 17:12:17 2015 +0200
sc tiled editing: Don't show cell selection when dragging shapes.
Change-Id: I367c53e245df8aa720463319a61835c65ff93875
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index a04bac9..518e2a5 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5775,6 +5775,7 @@ void ScGridWindow::UpdateCursorOverlay()
(pViewData->GetMarkData().IsMarked() ||
pViewData->GetMarkData().IsMultiMarked() ||
pViewData->GetViewShell()->GetScDrawView()->IsMarking() ||
pViewData->GetViewShell()->GetScDrawView()->IsTextEdit() ||
+ pViewData->GetViewShell()->GetScDrawView()->GetDragStat().IsShown() ||
pViewData->HasEditView(eWhich)))
{
return;
commit 2b3009cc183b90c6dba85493a679c141a71d0178
Author: Jan Holesovsky
Date: Fri Apr 3 15:31:01 2015 +0200
More additions about SdrView / SdrModel.
Change-Id: I2178d61af1f49c971ccec817852260020ec8f0aa
diff --git a/svx/README b/svx/README
index 9224fde..022f112 100644
--- a/svx/README
+++ b/svx/README
@@ -32,8 +32,24 @@ SdrObject <- SdrAttrObj <- E3dObject <- E3dCompoundObject <-
E3dCubeObj
The above is incomplete of course.
-Associated are the SdrPaintView's - they have quite a deep chain of
-inheritance, where each new class adds a bit of functionality:
+== SdrModel / SdrView ==
+
+Copied from svdview.hxx:
+
+ First of all the app creates a SdrModel.
+ Then it opens a Win and creates a SdrView.
+ ShowSdrPage() announces a page at SdrView.
+ It's possible to show SdrView in any Wins at once.
+
+ SdrView can show as many Wins as it wants at once. Pages are announced
+ or checked out with the help of ShowSdrPage()/HideSdrPage(). For every
announced
+ page there is a SdrPageView instance in container aPages. If more than one
page
+ is showed, you have to pay attention that the offset parameter of
ShowSdrPage()
+ is conformed to the size of the page (to prevent overlapping of two pages).
+
+SdrView itself is inherited from many objects in a chain of inheritance (all
+that starts with SdrPaintView - that is itself inherited from few classes
+too):
SdrPaintView <- SdrSnapView <- SdrMarkView <- SdrEditView <- SdrPolyEditView
^
commit ae54df263f3d7c7cc1f9e773f0487fd3877ccbb0
Author: Jan Holesovsky
Date: Fri Apr 3 15:15:40 2015 +0200
Added some ascii art for the SdrObject and SdrView.
Change-Id: If7e1e25315e282432a344b60b4602b1a51971399
diff --git a/svx/README b/svx/README
index a3574dd..9224fde 100644
--- a/svx/README
+++ b/svx/README
@@ -6,6 +6,47 @@ this is where a lot of wht work would happen to move to the
canvas. (what does t
svdraw
transparent gradient stuff.
+== SdrObject ==
+
+The shapes you can see in LibreOffice (like rectangle, etc.) are SdrObjects.
+They are declared as a hierarchy:
+
+SdrObject <- SdrAttrObj <- E3dObject <- E3dCompoundObject <- E3dCubeObj
+^ ^ ^ ^^ | | ^ ^
+| | | || | | | +--- E3dExtrudeObj
+| | | || | | +--
[Libreoffice-commits] core.git: sw/source
sw/source/ui/chrdlg/drpcps.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4c4a9767f7fb0c7891f1dd96cbe38a9c35e46083
Author: Caolán McNamara
Date: Fri Apr 3 16:25:13 2015 +0100
Resolves: tdf#83977 Push/Pop before/after messing with the cursor
otherwise we lose our selection with multi-page tables
Change-Id: I4f52d3cfb7a6d3c2cc1dbb68bbd5ce5c0005b1c3
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 9fe7da3..e10da98 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -271,8 +271,8 @@ void SwDropCapsPict::UpdatePaintSettings( void )
if (!mpPage->m_pTemplateBox->GetSelectEntryPos())
{
// query the Font at paragraph's beginning
-mpPage->rSh.SttCrsrMove();
mpPage->rSh.Push();
+mpPage->rSh.SttCrsrMove();
mpPage->rSh.ClearMark();
SwWhichPara pSwuifnParaCurr = GetfnParaCurr();
SwPosPara pSwuifnParaStart = GetfnParaStart();
@@ -286,8 +286,8 @@ void SwDropCapsPict::UpdatePaintSettings( void )
// CTL
GetFontSettings( *mpPage, maCTLFont, RES_CHRATR_CTL_FONT );
-mpPage->rSh.Pop(false);
mpPage->rSh.EndCrsrMove();
+mpPage->rSh.Pop(false);
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sfx2/source
sfx2/source/doc/docfile.cxx | 15 ++-
1 file changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 09aa700793f3f1b3344558ea8a91b8f4134099de
Author: Michael Stahl
Date: Thu Apr 2 15:57:47 2015 +0200
tdf#72337: sfx2: make the SfxMedium stream-reuse hack runtime-optional
SfxMedium::GetOutStream() does something different on WNT to solve
sharing issues on one kind of file server but that causes issues with
some other kind of file server that worked before.
Make this runtime-changeable with (undocumented) env variable
SFX_MEDIUM_REUSE_STREAM.
(regression from 3d12549335229aca1a6a57575292111274709992)
Change-Id: Id7a1fc8169dbf09c67a109b36ffa312ef33231c5
(cherry picked from commit 7c4415407f2df5460d3667aa9f820865a615f57f)
Reviewed-on: https://gerrit.libreoffice.org/15124
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index a80454d..711cbc7 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -560,8 +560,9 @@ SvStream* SfxMedium::GetOutStream()
{
// On windows we try to re-use XOutStream from xStream if that
exists;
// because opening new SvFileStream in this situation may fail
with ERROR_SHARING_VIOLATION
-#ifdef WNT
-if (pImp->xStream.is())
+// TODO: this is a horrible hack that should probably be removed,
+// somebody needs to investigate this more thoroughly...
+if (getenv("SFX_MEDIUM_REUSE_STREAM") && pImp->xStream.is())
{
assert(pImp->xStream->getOutputStream().is()); // need that...
pImp->m_pOutStream = utl::UcbStreamHelper::CreateStream(
@@ -569,15 +570,11 @@ SvStream* SfxMedium::GetOutStream()
}
else
{
-pImp->m_pOutStream = new SvFileStream(
-pImp->m_aName, STREAM_STD_READWRITE);
-}
// On Unix don't try to re-use XOutStream from xStream if that
exists;
// it causes fdo#59022 (fails opening files via SMB on Linux)
-#else
-pImp->m_pOutStream = new SvFileStream(
-pImp->m_aName, STREAM_STD_READWRITE);
-#endif
+pImp->m_pOutStream = new SvFileStream(
+pImp->m_aName, STREAM_STD_READWRITE);
+}
CloseStorage();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/inc sc/source
sc/inc/queryentry.hxx |3 ++-
sc/inc/queryparam.hxx |5 -
sc/source/core/data/dociter.cxx| 20 ++--
sc/source/core/data/table3.cxx |2 +-
sc/source/core/tool/doubleref.cxx |2 +-
sc/source/core/tool/interpr1.cxx | 18 +++---
sc/source/core/tool/queryentry.cxx |2 +-
sc/source/core/tool/queryparam.cxx | 17 -
8 files changed, 46 insertions(+), 23 deletions(-)
New commits:
commit c03db327a2904f5b2cef52be03d70b04cb473a52
Author: Eike Rathke
Date: Tue Mar 31 14:01:42 2015 +0200
Resolves: tdf#35636 implement match on empty cells
This implements search criteria "" and "=" to match empty cells in
spreadsheet functions SUMIF, AVERAGEIF, COUNTIF, SUMIFS, AVERAGEIFS and
COUNTIFS.
Change-Id: I1b4a4c14bac7b974428bf64afb549707a0d75a90
(cherry picked from commit 01b615687fe0f39c65e0e8290db434db2f1ef8ac)
Reviewed-on: https://gerrit.libreoffice.org/15091
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/inc/queryentry.hxx b/sc/inc/queryentry.hxx
index f024e6d..cac1170 100644
--- a/sc/inc/queryentry.hxx
+++ b/sc/inc/queryentry.hxx
@@ -43,8 +43,9 @@ struct SC_DLLPUBLIC ScQueryEntry
QueryType meType;
doublemfVal;
svl::SharedString maString;
+bool mbMatchEmpty;
-Item() : meType(ByValue), mfVal(0.0) {}
+Item() : meType(ByValue), mfVal(0.0), mbMatchEmpty(false) {}
bool operator== (const Item& r) const;
};
diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx
index 90105cc..867b15d 100644
--- a/sc/inc/queryparam.hxx
+++ b/sc/inc/queryparam.hxx
@@ -25,6 +25,8 @@
#include
+class SvNumberFormatter;
+
struct ScDBQueryParamInternal;
struct ScQueryEntry;
@@ -55,7 +57,8 @@ struct ScQueryParamBase
ScQueryEntry* FindEntryByField(SCCOLROW nField, bool bNew);
SC_DLLPUBLIC void RemoveEntryByField(SCCOLROW nField);
void Resize(size_t nNew);
-void FillInExcelSyntax(svl::SharedStringPool& rPool, const OUString&
aCellStr, SCSIZE nIndex);
+void FillInExcelSyntax( svl::SharedStringPool& rPool, const OUString&
aCellStr, SCSIZE nIndex,
+SvNumberFormatter* pFormatter );
protected:
typedef boost::ptr_vector EntriesType;
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 9240634..208bd33 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1117,8 +1117,24 @@ bool ScQueryCellIterator::GetThis()
if (maCurPos.first->type == sc::element_type_empty)
{
-IncBlock();
-continue;
+if (rItem.mbMatchEmpty && rEntry.GetQueryItems().size() == 1)
+{
+// This shortcut, instead of determining if any SC_OR query
+// exists or this query is SC_AND'ed (which wouldn't make
+// sense, but..) and evaluating them in ValidQuery(), is
+// possible only because the interpreter is the only caller
+// that sets mbMatchEmpty and there is only one item in those
+// cases.
+// XXX this would have to be reworked if other filters used it
+// in different manners and evaluation would have to be done in
+// ValidQuery().
+return true;
+}
+else
+{
+IncBlock();
+continue;
+}
}
ScRefCellValue aCell = sc::toRefCell(maCurPos.first, maCurPos.second);
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 4ec4b42..f02a4b6 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -3088,7 +3088,7 @@ bool ScTable::CreateExcelQuery(SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow
if (nIndex < nNewEntries)
{
rQueryParam.GetEntry(nIndex).nField = pFields[nCol -
nCol1];
-rQueryParam.FillInExcelSyntax(rPool, aCellStr, nIndex);
+rQueryParam.FillInExcelSyntax(rPool, aCellStr, nIndex,
NULL);
nIndex++;
if (nIndex < nNewEntries)
rQueryParam.GetEntry(nIndex).eConnect = SC_AND;
diff --git a/sc/source/core/tool/doubleref.cxx
b/sc/source/core/tool/doubleref.cxx
index 5de3489..4f4c523 100644
--- a/sc/source/core/tool/doubleref.cxx
+++ b/sc/source/core/tool/doubleref.cxx
@@ -191,7 +191,7 @@ bool lcl_createExcelQuery(
if (nIndex < nNewEntries)
{
pParam->GetEntry(nIndex).nField = aFields[nCol];
-pParam->FillInExcelSyntax(rPool, aCellStr, nIndex);
+pParam->FillInExcelSyntax(rPool, aCellStr, nIndex,
NULL);
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 2 commits - android/experimental android/README
android/README | 22 android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/.classpath |8 android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/.project | 33 android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/.settings/org.eclipse.jdt.core.prefs | 11 android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/AndroidManifest.xml | 28 android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/proguard.cfg | 40 android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/project.properties | 11 android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/file_explorer_grid_item.xml | 29 android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/file_grid.xml | 20 android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/file_list.xml | 13 android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/file_list_item.xml | 41 android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/main.xml | 15 android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/menu/view_menu.xml | 20 android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/values/arrays.xml | 56 - android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/values/strings.xml | 16 android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/xml/libreoffice_preferences.xml | 21 android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/FileUtilities.java | 159 -- android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/GridItemAdapter.java | 95 - android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/LibreOfficeUIActivity.java | 548 -- android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/ListItemAdapter.java | 159 -- android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/PageView.java | 63 - android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/PreferenceEditor.java | 18 android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/WriterViewerActivity.java | 37 android/experimental/GSoC-2012-eclipse-workspace/TextturePage/.classpath |8 android/experimental/GSoC-2012-eclipse-workspace/TextturePage/.project | 33 android/experimental/GSoC-2012-eclipse-workspace/TextturePage/AndroidManifest.xml | 23 android/experimental/GSoC-2012-eclipse-workspace/TextturePage/proguard-project.txt | 20 android/experimental/GSoC-2012-eclipse-workspace/TextturePage/project.properties | 14 android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/layout/main.xml | 12 android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/values/strings.xml |7 android/experimental/GSoC-2012-eclipse-workspace/TextturePage/src/libreoffice/android/ui/Mesh.java | 259 android/experimental/GSoC-2012-eclipse-workspace/TextturePage/src/libreoffice/android/ui/Page.java | 90 - android/experimental/GSoC-2012-eclipse-workspace/TextturePage/src/libreoffice/android/ui/TextturePageActivity.java | 227 dev/null |binary 34 files changed, 2 insertions(+), 2154 deletions(-) New commits: commit cf2db6d937947479cf52dfb79618c2dd6833c5e2 Author: Miklos Vajna Date: Fri Apr 3 17:41:49 2015 +0200 android: update startup details of README Change-Id: I88a0483e96f2de38ae3c1bc6f707e3b5b504bbac diff --git a/android/README b/android/README index c0a7e93..48c3d6e 100644 --- a/android/README +++ b/android/README @@ -249,30 +249,12 @@ lo_dlneeds: Could not read ELF header of /data/data/org.libreoffice...libfoo.so This (most likely) means that the install quietly failed, and that the file is truncated; check it out with adb shell ls -l /data/data/ -* Detailed explanation - -Note: the b
[Libreoffice-commits] core.git: 4 commits - offapi/com sc/inc sc/source
offapi/com/sun/star/sheet/XConditionalFormat.idl | 11 ++
offapi/com/sun/star/sheet/XConditionalFormats.idl |2
sc/inc/colorscale.hxx | 18
sc/source/core/data/colorscale.cxx| 85 +++---
sc/source/ui/inc/condformatuno.hxx| 11 +-
sc/source/ui/unoobj/condformatuno.cxx | 80 +---
6 files changed, 162 insertions(+), 45 deletions(-)
New commits:
commit 2ec69c6fea4594f3f00c22ac9bb31a888483b318
Author: Markus Mohrhard
Date: Fri Apr 3 16:51:36 2015 +0200
document a few missing pieces
Change-Id: I88a48ada4f9e261e425127bc1b0d3db83f1fabba
diff --git a/sc/source/ui/unoobj/condformatuno.cxx
b/sc/source/ui/unoobj/condformatuno.cxx
index 0acab07..74899e6 100644
--- a/sc/source/ui/unoobj/condformatuno.cxx
+++ b/sc/source/ui/unoobj/condformatuno.cxx
@@ -962,6 +962,10 @@ void SAL_CALL ScColorScaleFormatObj::setPropertyValue(
uno::Sequence > aEntries;
if (aValue >>= aEntries)
{
+if (aEntries.getLength() < 2)
+throw lang::IllegalArgumentException();
+
+// TODO: we need to make sure that there are enough entries
size_t n = size_t(aEntries.getLength());
for (size_t i = 0; i < n; ++i)
{
@@ -1663,6 +1667,7 @@ void SAL_CALL ScIconSetFormatObj::setPropertyValue(
throw lang::IllegalArgumentException();
}
+// TODO: we need to make sure that there are enough entries
getCoreObject()->GetIconSetData()->eIconSetType = eType;
}
break;
@@ -1671,6 +1676,8 @@ void SAL_CALL ScIconSetFormatObj::setPropertyValue(
uno::Sequence > aEntries;
if (aValue >>= aEntries)
{
+// TODO: we need to check that the number of entries
+// corresponds to the icon type
sal_Int32 nLength = aEntries.getLength();
for (size_t i = 0; i < size_t(nLength); ++i)
{
commit 5b75b4e1ec77515db811be9d7895bb7bd9d23088
Author: Markus Mohrhard
Date: Fri Apr 3 16:44:51 2015 +0200
first part for correct handling of new cond format entries
Change-Id: I82f66218bf02898e523e4f69fec9166aa00d0b83
diff --git a/offapi/com/sun/star/sheet/XConditionalFormat.idl
b/offapi/com/sun/star/sheet/XConditionalFormat.idl
index 62f9962..aed1fec 100644
--- a/offapi/com/sun/star/sheet/XConditionalFormat.idl
+++ b/offapi/com/sun/star/sheet/XConditionalFormat.idl
@@ -17,7 +17,16 @@ module com { module sun { module star { module sheet {
interface XConditionalFormat : com::sun::star::container::XIndexAccess
{
-void addEntry( [in] com::sun::star::sheet::XConditionEntry entry );
+/**
+ * Creates a new conditional format entry and insert its at the position.
+ *
+ * @param Type: a com.sun.star.sheet.ConditionFormatEntryType specifying
the
+ * type of the new entry
+ *
+ * @param Position: the position in the conditional format
+ *
+ */
+void createEntry( [in] long Type, [in] long Position );
void removeByIndex( [in] long Index );
};
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 7409706..110a27a 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -284,6 +284,12 @@ public:
ScColorScaleEntry* GetEntry(size_t nPos);
size_t size() const;
+
+/**
+ * Makes sure that the maColorScales contain at least 2 entries.
+ * Should be called when it is not sure that the format is valid.
+ */
+void EnsureSize();
};
class SC_DLLPUBLIC ScDataBarFormat : public ScColorFormat
@@ -309,6 +315,12 @@ public:
virtual condformat::ScFormatEntryType GetType() const SAL_OVERRIDE;
+/**
+ * Makes sure that the mpFormatData does not contain valid entries.
+ * Should be called when it is not sure that the format is valid.
+ */
+void EnsureSize();
+
private:
double getMin(double nMin, double nMax) const;
double getMax(double nMin, double nMax) const;
@@ -370,6 +382,12 @@ public:
size_t size() const;
+/**
+ * Makes sure that the mpFormatData does not contain valid entries.
+ * Should be called when it is not sure that the format is valid.
+ */
+void EnsureSize();
+
private:
double GetMinValue() const;
diff --git a/sc/source/core/data/colorscale.cxx
b/sc/source/core/data/colorscale.cxx
index 9f02077..ed1956f 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -684,6 +684,14 @@ size_t ScColorScaleFormat::size() const
return maColorScales.size();
}
+void ScColorScaleFormat::EnsureSize()
+{
+if (maColorScales.size() < 2)
+{
+// TODO: create 2 valid entries
+}
+}
+
ScDataBarFormat::ScDataBarFormat(ScDocument* pDoc):
ScColorFormat(pDoc)
{
@@ -944,6 +952,18 @@ ScDataBarInf
Minutes of ESC call: 2015-04-02
* Present: + Sophie, Nobert, Muthu, Christian, Robinson, Stephan, Miklos, Markus, Kendy, Bjoern, Michael S., Thorsten, Bubli * Completed Action Items: + poke Mathiew wrt. Windows / locking bug & revert if no response (Michael S) https://bugs.documentfoundation.org/show_bug.cgi?id=72337 [ Michael S. updated the patch - now controlled by an env. var at least ] https://gerrit.libreoffice.org/#/c/15118/ + if you have photos from ESC meetings during LibOCon, please send them to Sophie [ Kendy has one & sent ] + send list C't recommended extensions to the design list (Bjoern) [ sent to Kendy ] * Pending Action Items: + please file an Easy-Hack this week: just a bug with whiteboard: (All) "EasyHack DifficultyBeginner SkillCpp TopicCleanup" + thanks to: David, Markus, Matthew, Stephan + http://bit.ly/1KR4HWX + make sure to create a new openid if you are using the Google openID (all) [ still need to get this done ! ] + clear old patches rotting on gerrrit (all) https://gerrit.libreoffice.org/#/q/status:open+project:core+branch:master+%28label:Code-Review%253D-1+OR+label:Code-Review%253D-2%29+age:6week,n,z http://nabble.documentfoundation.org/LibreOffice-Gerrit-News-for-core-on-2015-03-23-td4144131.html [ link to patches that are older than 6 weeks. Abandoning gets them off the list - but you can always re-vitalize them. AI: Rescue your patch now - or have it abandoned for you by next week (Bjoern) will wait one more week ] + poke Italo wrt. Android remote now supporting watches (Cloph) [ pending on screenshots ] + Cambridge hackfest - poke about students (Michael) * GSoC (Cedric/Fridrich) + students review & ranking: deadline April 13th + what's the process? + new column in the overview - easy to see who hasn't have an easy hack (Miklos) + need to filter out those that clearly do not fit the rules (Kendy) + some sorting already going on in Melange (Bjoern) + Wiki page for tasks: https://wiki.documentfoundation.org/Development/Gsoc/Ideas * Release Engineering update (Cloph) + 4.4.2 released as final today + 4.4.3 RC1 status April 13th + 4.3.7 RC1 April 7th or so + planned for the next Wed. + 5.0.0 - 1st Alpha release - April 13th + week after 4.3.7 + marketing supports this + how about the profile - still call it 4? (Kendy) + so that we do not have to care about the migration? (Kendy) AI: + will check with Italo the exact version number [5.0 or 5.0.0] (Cloph) AI: + check if it's possible to still have the profile as 4 (technically - configure.ac etc.) (Cloph) + should "just work," given the "4" in the user profile path name is only hard-coded into the UserInstallation= line in the bootstrap ini-file (Stephan) + QA should be made aware of this too (Bjoern) + Windows 64 bit story ? (Stephan) + targeting this for Alpha 1 with Norbert (Cloph) + tinderbox will be ready for the Alpha + Android & iOS Remote * Crashtest update (Markus / Caolán) + regression around xls export crashes + jumped recently from 5 to 130 - what's the status? + fixed by reverting the commit (Moggi) + never hit the release branches + a few thousand validation false positives gone + by updating the office-o-tron script + import crashes look great - ~20 + export crashes still high, most in Writer * Hackfests (Bjoern) + Cambridge, UK - May 2015 - contact (Michael) + 21st -> 23rd May confirmed. Thur / Fri / Sat. + Cambridge Beer Festival overlap / Punting Excursion planned etc. https://wiki.documentfoundation.org/Hackfest/Cambridge2015 * UX Update (Kendy) + did not attend yesterday, sorry * l10n Update (Sophie) + upgrading to new Pootle version: 2.5 -> 2.7 + large migration; fixing / customizing the new version + will be tested the next week + old version still functional / online of course * Committers * Developer Certification (Stephan/Bjoern/Kendy/Thorsten) + looked at last year's commits; perhaps a few people. + 3 names so far, more research going on * Jenkins update (Norbert) + from:Thu Mar 26 13:46:18 2015 + master linux jobs:137 ok:114 ko:22 break:4 broken duration:9.6% + master mac jobs:118 ok:98 ko:20 break:7 broken duration:10.84% + master win jobs:123 ok:52 ko:71 break:5 broken duration:49.41% + lo-4.4 mac jobs:16 ok:15 ko:1 break:1 broken duration:2.12% + the above is output from a script + goals for the numbers (Bjoern) + above percentage is the duration of brokeness, _not_ the number of final push commit breakage (w
Minutes of the Design Hangout: 2015-03-25
* Present: Heiko, Mattias, Cor, David, Jay, Stuart * Completed Action Items: + Jay: Double check if we can change 'Spelling' to 'Spelling and Grammar' https://bugs.freedesktop.org/show_bug.cgi?id=87648 + grammar checkbox not accessible in calc and impress/draw + would be good to unify there name to something like 'Spelling Check', 'Spell Checker', etc + Spell Checking (Heiko) + removing "and grammar" seems nice, most people wouldn't care (Mattias) + languages other than English don't have grammar check (Jay) + Calligra uses 'Spell Checking' and MSO uses 'Spelling and Grammar' + Leave it as is and wait for grammar to be implemented in other modules (Stuart, +Heiko) + related implementation issues for handling the grammar checker -- seeking input from László https://bugs.documentfoundation.org/show_bug.cgi?id=88323 * Pending Action Items: + Jay: Send a mail to documentat...@global.libreoffice.org with the wiki page that collects changes in menus + Kendy: Collecting of the user information should be incremental, somewhere in the user's profile + Ahmed: Push the new Sifr icons he's done recently + Kendy: Talk to Milos wrt. https://bugs.freedesktop.org/show_bug.cgi?id=48622 + Alex: Gnome 2.20-style 'a' icons & Gnome 3-style text line icons + Samuel: Formulas and Navigator should open in the sidebar, not as a special window https://bugs.freedesktop.org/show_bug.cgi?id=85897 + Is that issue for the Navigator too (I dont read it from the issue) and in Writer the choice anycase was to allow opening separate too. (Cor, after discussion on 20150128) + the bug report only discusses the separate formulas sidebar in calc (Jay) + Kendy: https://bugs.freedesktop.org/show_bug.cgi?id=87794 + check how the sliders in the Audio/Video toolbar are implemented to move them to sidebar + Jay: Create a bug report about problem with parent icon set links.txt entries not appearing in child icon sets (Jay) + Kendy: Make sifr icons fall back on breeze icons as breeze is more complete * UI changes integrated the last week: + Sidebar tabs in impress have been reorganized (Jay) https://bugs.documentfoundation.org/show_bug.cgi?id=87904 * Icon Updates / Issues + Tango + Latest status of updates available here (Jay) https://docs.google.com/document/d/1OErlXIDDGM7V1mOGW8oSCLuhqw5fulT1XhkTik1u2UY/edit?usp=sharing + Sifr + David said he'd like to assist with it + Latest status of updates available here (Jay) https://docs.google.com/document/d/15ZpVaTxg7TAFYhOyQUP3mp-cVtKA1vP5uZAT38t-taA/edit?usp=sharing + Breeze (Andreas/Jay) + Andreas got git access and is pushing changes + Extra-Large (32x32) Icons for large resolutions + nothing new * Insert Special Character (Heiko/Jay) + Blog posted - http://user-prompt.com/libreoffice-design-session-special-character/ (Heiko) + People quite liked the simple solution + Addition of an editable unicode name to allow search by symbol name suggested + All like extended solution, if it possible to implement * Shapes Sidebar (Heiko/Jay) + https://docs.google.com/document/d/1Sv3Q-XdnHElYGXX2m8OLbRAy1zyodcU231Gn2SkVRV0/edit?usp=sharing + Prefer the folder/file option because of consistency with gallery (Stuart) + Blog post should contain of accordion vs folder/file options only (Jay) AI: + Would prefer a single accordion collection of shapes and will provide a mockup (Matthias) AI: + Publish it in the blog post (Heiko) * Sidebar Hide/Show Button Color (Jay) + https://bugs.documentfoundation.org/show_bug.cgi?id=83527 + kingsoft - https://bug-attachments.documentfoundation.org/attachment.cgi?id=105799 + symphony - https://bug-attachments.documentfoundation.org/attachment.cgi?id=114446 + no decision reached * Next Friday's design session (Jay) + 12pm UTC (changed acc. DST) + No topic decided yet + List of possible future topics https://docs.google.com/document/d/1XiJauFHrSmM5LsaV0AlglhfUh8D1IxAg8qistP0KAQA/edit?usp=sharing ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 12 ++--
1 file changed, 2 insertions(+), 10 deletions(-)
New commits:
commit 514f9fc675eb3d116adb4b0a33c19c3d6e99e98b
Author: Miklos Vajna
Date: Fri Apr 3 19:28:25 2015 +0200
CppunitTest_sw_ooxmlexport5: fix Fedora 22 alpha build
09:41 <@dtardon> vmiklos, maybe it's a regression in libxml2. "Fix XPath
'//' optimization with predicates (Nick Wellnhofer)" in NEWS looks suspicious
So tweak the XPath not to use // for now.
Change-Id: Ia1c4508d8aede5818bc258d6e4243f026da3a3cd
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 43ced22..f04e8b9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -745,16 +745,8 @@ DECLARE_OOXMLEXPORT_TEST(testSectionProtection,
"sectionprot.odt")
{
if (xmlDocPtr pXmlDoc = parseExport("word/document.xml"))
{
-#ifdef MACOSX
-xmlXPathObjectPtr pXmlObj = getXPathNode(pXmlDoc, "//w:formProt[1]");
-xmlNodeSetPtr pXmlNodes = pXmlObj->nodesetval;
-if (xmlXPathNodeSetGetLength(pXmlNodes) != 1)
-// We asked for exactly one node, got more than that, then give up
testing.
-return;
-#endif
-
-assertXPath(pXmlDoc, "//w:formProt[1]", "val", "true");
-assertXPath(pXmlDoc, "//w:formProt[2]", "val", "false");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p/w:pPr/w:sectPr/w:formProt", "val", "true");
+assertXPath(pXmlDoc, "/w:document/w:body/w:sectPr/w:formProt", "val",
"false");
}
if (xmlDocPtr pXmlSettings = parseExport("word/settings.xml"))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Test name: testSectionProtection::Import_Export_Import equality assertion failed (CppunitTest_sw_ooxmlexport5)
Should be ok now with http://cgit.freedesktop.org/libreoffice/core/commit/?id=514f9fc675eb3d116adb4b0a33c19c3d6e99e98b -- View this message in context: http://nabble.documentfoundation.org/Test-name-testSectionProtection-Import-Export-Import-equality-assertion-failed-CppunitTest-sw-ooxmle-tp4145315p4145339.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Minutes of the Design Hangout: 2015-04-01
Hi, Terribly sorry - these were the minutes from the 1st April, not from 25th March. I'll send the others shortly. All the best, Kendy Jan Holesovsky píše v Pá 03. 04. 2015 v 18:56 +0200: > * Present: Heiko, Mattias, Cor, David, Jay, Stuart > > * Completed Action Items: > > + Jay: Double check if we can change 'Spelling' to 'Spelling and Grammar' > https://bugs.freedesktop.org/show_bug.cgi?id=87648 > + grammar checkbox not accessible in calc and impress/draw > + would be good to unify there name to something like 'Spelling > Check', 'Spell Checker', etc > + Spell Checking (Heiko) > + removing "and grammar" seems nice, most people wouldn't care > (Mattias) > + languages other than English don't have grammar check (Jay) > + Calligra uses 'Spell Checking' and MSO uses 'Spelling and > Grammar' > + Leave it as is and wait for grammar to be implemented in other > modules (Stuart, +Heiko) > + related implementation issues for handling the grammar checker > -- seeking input from László > https://bugs.documentfoundation.org/show_bug.cgi?id=88323 > > * Pending Action Items: > > + Jay: Send a mail to documentat...@global.libreoffice.org with the wiki > page that collects changes in menus > + Kendy: Collecting of the user information should be incremental, > somewhere in the user's profile > + Ahmed: Push the new Sifr icons he's done recently > + Kendy: Talk to Milos wrt. > https://bugs.freedesktop.org/show_bug.cgi?id=48622 > + Alex: Gnome 2.20-style 'a' icons & Gnome 3-style text line icons > + Samuel: Formulas and Navigator should open in the sidebar, not as a > special window > https://bugs.freedesktop.org/show_bug.cgi?id=85897 > + Is that issue for the Navigator too (I dont read it from the issue) > and in Writer the choice anycase was to allow opening separate too. > (Cor, after discussion on 20150128) > + the bug report only discusses the separate formulas sidebar in > calc (Jay) > + Kendy: https://bugs.freedesktop.org/show_bug.cgi?id=87794 > + check how the sliders in the Audio/Video toolbar are implemented > to move them to sidebar > + Jay: Create a bug report about problem with parent icon set links.txt > entries not appearing in child icon sets (Jay) > + Kendy: Make sifr icons fall back on breeze icons as breeze is more > complete > > * UI changes integrated the last week: > > + Sidebar tabs in impress have been reorganized (Jay) > https://bugs.documentfoundation.org/show_bug.cgi?id=87904 > > * Icon Updates / Issues > > + Tango > + Latest status of updates available here (Jay) > > https://docs.google.com/document/d/1OErlXIDDGM7V1mOGW8oSCLuhqw5fulT1XhkTik1u2UY/edit?usp=sharing > > + Sifr > + David said he'd like to assist with it > + Latest status of updates available here (Jay) > > https://docs.google.com/document/d/15ZpVaTxg7TAFYhOyQUP3mp-cVtKA1vP5uZAT38t-taA/edit?usp=sharing > > + Breeze (Andreas/Jay) > + Andreas got git access and is pushing changes > > + Extra-Large (32x32) Icons for large resolutions > + nothing new > > * Insert Special Character (Heiko/Jay) > > + Blog posted - > http://user-prompt.com/libreoffice-design-session-special-character/ (Heiko) > + People quite liked the simple solution > + Addition of an editable unicode name to allow search by symbol > name suggested > + All like extended solution, if it possible to implement > > * Shapes Sidebar (Heiko/Jay) > > + > https://docs.google.com/document/d/1Sv3Q-XdnHElYGXX2m8OLbRAy1zyodcU231Gn2SkVRV0/edit?usp=sharing > + Prefer the folder/file option because of consistency with gallery > (Stuart) > + Blog post should contain of accordion vs folder/file options only > (Jay) > AI: + Would prefer a single accordion collection of shapes and will > provide a mockup (Matthias) > AI: + Publish it in the blog post (Heiko) > > * Sidebar Hide/Show Button Color (Jay) > + https://bugs.documentfoundation.org/show_bug.cgi?id=83527 > + kingsoft - > https://bug-attachments.documentfoundation.org/attachment.cgi?id=105799 > + symphony - > https://bug-attachments.documentfoundation.org/attachment.cgi?id=114446 > + no decision reached > > * Next Friday's design session (Jay) > + 12pm UTC (changed acc. DST) > + No topic decided yet > + List of possible future topics > > https://docs.google.com/document/d/1XiJauFHrSmM5LsaV0AlglhfUh8D1IxAg8qistP0KAQA/edit?usp=sharing > > > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Minutes of the Design Hangout: 2015-03-25 [now really :-)]
* Present: Heiko, Ibrahim (joined later), Jay, Kendy * Completed Action Items: + Default document view for Writer, single page rather than automatic https://bugs.freedesktop.org/show_bug.cgi?id=88001 + Stuart: Change the default to single page + Jay/Stuart: Change the tooltip to "Multipage view" or "Multiple page view" [https://bugs.freedesktop.org/show_bug.cgi?id=88001#c5 - would be great to get that to gerrit] AI: Stuart -- figure it out and get it posted. * Pending Action Items: + Jay: Double check if we can change 'Spelling' to 'Spelling and Grammar' https://bugs.freedesktop.org/show_bug.cgi?id=87648 + Jay: Send a mail to documentat...@global.libreoffice.org with the wiki page that collects changes in menus + Kendy: Collecting of the user information should be incremental, somewhere in the user's profile + Ahmed: Push the new Sifr icons he's done recently + Kendy: Talk to Milos wrt. https://bugs.freedesktop.org/show_bug.cgi?id=48622 + Alex: Gnome 2.20-style 'a' icons & Gnome 3-style text line icons + Samuel: Formulas and Navigator should open in the sidebar, not as a special window https://bugs.freedesktop.org/show_bug.cgi?id=85897 + Is that issue for the Navigator too (I dont read it from the issue) and in Writer the choice anycase was to allow opening separate too. (Cor, after discussion on 20150128) + the bug report only discusses the separate formulas sidebar in calc (Jay) + Kendy: https://bugs.freedesktop.org/show_bug.cgi?id=87794 + check how the sliders in the Audio/Video toolbar are implemented to move them to sidebar * UI changes integrated the last week: + Draw's new UI (Jay) https://bugs.documentfoundation.org/show_bug.cgi?id=90090 + Only thing pending is opening the sidebar by default + Removal of direct formatting from context menu (Jay) + Kendy can you push this if its okay - https://gerrit.libreoffice.org/14979 + Darker measurement numbers for the ruler (Jay) + One for you kendy :D - https://bugs.documentfoundation.org/show_bug.cgi?id=90205 * New Draw UI (Jay) + changes are in - drawing tools, toolbars + was able to change the size of the pages pane, but not possible to hide it + hopefully Rishabh will be able to change that + the Navigator should be made more useful / usable + Jay has a plan for that + Jay will provide the layout & mockup + Shapes sidebar will be a topic for Friday * Icon Updates / Issues + Problems + Tango and sifr are having problems and are falling back on galaxy rather than industrial and parent links.txt (Jay) AI: + will create a bugreport (Jay) + Tango + Updated a number of icons (Jay) + Latest status of updates available here (Jay) https://docs.google.com/document/d/1OErlXIDDGM7V1mOGW8oSCLuhqw5fulT1XhkTik1u2UY/edit?usp=sharing + Sifr + Updated a number of icons (Jay) + Created a google doc with what things are pending to partially complete it and shared with Mathias and Ahmed (Jay) https://docs.google.com/document/d/15ZpVaTxg7TAFYhOyQUP3mp-cVtKA1vP5uZAT38t-taA/edit?usp=sharing + Breeze (Andreas/Jay) + Pushed another round of updates as Andreas isnt able to get gerrit working (Jay) + Andreas published a blog on the icons being close to completion https://kdeonlinux.wordpress.com/2015/03/25/breeze-love-libre-office/ + Breeze will be bundled with 4.4 for next month's Kubuntu 15.04 release which uses Plasma 5 http://starsky.19inch.net/~jr/tmp/libreoffice.png + Update log between Jay and Andreas on improvements https://docs.google.com/document/d/1dpMFgmkQy4BsyRIKH97ZLPTU6NdvXIYk3Yossj6sSQM/edit?usp=sharing + should we use that by default on Windows 8 and 10? (Jay) + technically not a problem to detect (Kendy) + fits Metro, but not the general Windows look (Jay/Heiko) + conclusion: let's not do it for the moment + breeze now more complete than Sifr, should switch the fallack (Jay) AI: + yep (Kendy) + Extra-Large (32x32) Icons for large resolutions + nothing new * CMIS / online documents mockup (Heiko/Jay) + blogpost posted + several comments + google 2-step authentication + wording suggestions + search functionality + integration into the system file dialog + the comments did not uncover any blocker, may be addressed during implementation * Insert Special Character (Heiko/Jay) + https://docs.google.com/document/d/1PxkIpkzgWF1cX9oQmBhjiTBhUXvUEqbz06Bn4hzbF54/edit?usp=sharing + no comments, can go ahead with the blog post (Heiko) + 2 possible solutions AI: + publish that (Heiko) + the advanced solution: OCR-like graphics sea
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/colorscale.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0df12e2f1356172af5cde66a8fd36a10b430c9e5
Author: Miklos Vajna
Date: Fri Apr 3 20:46:49 2015 +0200
sc: -Werror,-Wunused-variable
Change-Id: I635efd806bf9a6d158fb0df7a1705f42966ba669
diff --git a/sc/source/core/data/colorscale.cxx
b/sc/source/core/data/colorscale.cxx
index ed1956f..15fc616 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -1359,7 +1359,7 @@ void ScIconSetFormat::EnsureSize()
{
if (aIconSetMap[i].eType == eType)
{
-size_t nElements = aIconSetMap[i].nElements;
+// size_t nElements = aIconSetMap[i].nElements;
// TODO: implement
break;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/condformat/colorformat.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b326270fb921b3c2e7fff2da76ebae33adcaef3d
Author: Miklos Vajna
Date: Fri Apr 3 20:55:04 2015 +0200
sc: no need to pass these by value
Change-Id: Iab334625fbbe2a8d991a17b05538897a23fc34db
diff --git a/sc/source/ui/condformat/colorformat.cxx
b/sc/source/ui/condformat/colorformat.cxx
index dc044be4..0376889 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -185,7 +185,7 @@ void GetAxesPosition(ScDataBarFormatData* pData, const
ListBox* rLbox)
}
}
-void SetBarLength(ScDataBarFormatData* pData, OUString minStr, OUString
maxStr, SvNumberFormatter* mpNumberFormatter)
+void SetBarLength(ScDataBarFormatData* pData, const OUString& minStr, const
OUString& maxStr, SvNumberFormatter* mpNumberFormatter)
{
double nMinValue = 0;
sal_uInt32 nIndex = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Test name: testSectionProtection::Import_Export_Import equality assertion failed (CppunitTest_sw_ooxmlexport5)
serval2...@yahoo.fr wrote: > Should be ok now with > http://cgit.freedesktop.org/libreoffice/core/commit/?id=514f9fc675eb3d116adb4b0a33c19c3d6e99e98b It is indeed. Thank you all :-) - d. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sc/source
sc/source/ui/view/gridwin.cxx | 25 +
1 file changed, 21 insertions(+), 4 deletions(-)
New commits:
commit d4eb2213875664b4268bac5f94fed5a05b79dd82
Author: Henry Castro
Date: Fri Apr 3 16:29:24 2015 -0400
sc tiled editing: Changed behaviour double click to click.
In the tiled rendering case, it points the cell cursor, and immediately
start the editing.
When it is double click, it will only trigger the selection of the cell.
Change-Id: Iafcabba408533e8162bd45d780f5e8926c6970bb
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 518e2a5..0ec678f 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1837,6 +1837,17 @@ void ScGridWindow::HandleMouseButtonDown( const
MouseEvent& rMEvt, MouseEventSta
// TestMouse schon oben passiert
}
+// In the tiled rendering case, select shapes
+if (rMEvt.IsLeft() &&
pViewData->GetDocument()->GetDrawLayer()->isTiledRendering())
+{
+if ( !bCrossPointer && DrawMouseButtonDown(rMEvt) )
+{
+return;
+}
+
+pViewData->GetViewShell()->SetDrawShell( false );
+}
+
Point aPos = rMEvt.GetPosPixel();
SCsCOL nPosX;
SCsROW nPosY;
@@ -1916,6 +1927,10 @@ void ScGridWindow::HandleMouseButtonDown( const
MouseEvent& rMEvt, MouseEventSta
}
else
nMouseStatus = SC_GM_TABDOWN;
+
+// In the tiled rendering case, fake mouse status to double click
+if ( nMouseStatus == SC_GM_TABDOWN &&
pDoc->GetDrawLayer()->isTiledRendering() )
+nMouseStatus = SC_GM_DBLDOWN;
}
// Links in Edit-Zellen
@@ -2200,9 +2215,8 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt
)
pView->ResetBrushDocument();// invalidates pBrushDoc
pointer
}
-// double click (only left button)
-
-bool bDouble = ( rMEvt.GetClicks() == 2 && rMEvt.IsLeft() );
+// In the tiled rendering case, change double click to single click (only
left button)
+bool bDouble = ( pDoc->GetDrawLayer()->isTiledRendering() &&
rMEvt.IsLeft() ) || ( rMEvt.GetClicks() == 2 && rMEvt.IsLeft() );
if ( bDouble && !bRefMode && nMouseStatus == SC_GM_DBLDOWN &&
!pScMod->IsRefDialogOpen() )
{
// data pilot table
@@ -2751,7 +2765,10 @@ void ScGridWindow::Tracking( const TrackingEvent& rTEvt )
MouseEvent aUpEvt( rMEvt.GetPosPixel(), rMEvt.GetClicks(),
rMEvt.GetMode(), nButtonDown, rMEvt.GetModifier()
);
-MouseButtonUp( aUpEvt );
+
+// In the tiled rendering case, do not spawn fake mouse up
+if (!pViewData->GetDocument()->GetDrawLayer()->isTiledRendering())
+MouseButtonUp( aUpEvt );
}
else
MouseMove( rMEvt );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 4 commits - sc/source
sc/source/ui/unoobj/docuno.cxx | 12 +---
sc/source/ui/view/gridwin4.cxx | 35 +--
sc/source/ui/view/viewdata.cxx | 15 +++
3 files changed, 45 insertions(+), 17 deletions(-)
New commits:
commit 440c2c1cccf26e5e0eda6b7ae1a2868798b4057b
Author: Jan Holesovsky
Date: Fri Apr 3 23:22:56 2015 +0200
sc tiled editing: Fix the conversion so that it works with zoom too.
Change-Id: I80d9ed6abe6b3ddb2bb1e0d6b7c74ce50d0df55a
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index b098082..231d1f8 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -480,9 +480,8 @@ void ScModelObj::paintTile( VirtualDevice& rDevice,
//if (pGridWindow->GetOutputSizePixel() != aTileSize)
//pGridWindow->SetOutputSizePixel(Size(nOutputWidth, nOutputHeight));
// so instead for now, set the viewport size to document size
-const MapMode aMapTwip(MAP_TWIP);
Size aDocSize = getDocumentSize();
-pGridWindow->SetOutputSizePixel(pGridWindow->LogicToPixel(aDocSize,
aMapTwip));
+pGridWindow->SetOutputSizePixel(Size(aDocSize.Width() *
pViewData->GetPPTX(), aDocSize.Height() * pViewData->GetPPTY()));
pGridWindow->PaintTile( rDevice, nOutputWidth, nOutputHeight,
nTilePosX, nTilePosY, nTileWidth, nTileHeight );
commit ca18f7310f76f72f86806bd2586486e7c446a098
Author: Jan Holesovsky
Date: Fri Apr 3 23:07:31 2015 +0200
Revert "sc tiled editing: This got fixed by the recent changes."
Needed again.
This reverts commit b11c58889cde10f43a9f239a959eb2c252dc4db7.
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index a9c0135..269d12e 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -893,7 +893,10 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice,
const ScTableInfo& rTableI
// set the correct mapmode
Rectangle aBackground(aStart, aEnd);
if (bIsTiledRendering)
+{
+aBackground += Point(nScrX, nScrY);
rDevice.SetMapMode(aDrawMode);
+}
else
rDevice.SetMapMode(pViewData->GetLogicMode());
commit 5deb60a4ef6243bcef5c6a50b3ed2073d3353bc9
Author: Jan Holesovsky
Date: Fri Apr 3 23:04:06 2015 +0200
sc tiled editing: For now, revert to using the entire doc size.
There are still too many problems with the interaction with the editeng,
unfortunately.
Change-Id: I5cdbc80dbe1dc3996ecd89f0bca5399cbfb9c9b0
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 7c3bb1b..b098082 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -473,9 +473,16 @@ void ScModelObj::paintTile( VirtualDevice& rDevice,
ScGridWindow* pGridWindow = pViewData->GetActiveWin();
// update the size of the area we are painting
-Size aTileSize(nOutputWidth, nOutputHeight);
-if (pGridWindow->GetOutputSizePixel() != aTileSize)
-pGridWindow->SetOutputSizePixel(Size(nOutputWidth, nOutputHeight));
+// FIXME we want to use only the minimal necessary size, like the
+// following; but for the moment there is too many problems with that and
+// interaction with editeng used for the cell editing
+//Size aTileSize(nOutputWidth, nOutputHeight);
+//if (pGridWindow->GetOutputSizePixel() != aTileSize)
+//pGridWindow->SetOutputSizePixel(Size(nOutputWidth, nOutputHeight));
+// so instead for now, set the viewport size to document size
+const MapMode aMapTwip(MAP_TWIP);
+Size aDocSize = getDocumentSize();
+pGridWindow->SetOutputSizePixel(pGridWindow->LogicToPixel(aDocSize,
aMapTwip));
pGridWindow->PaintTile( rDevice, nOutputWidth, nOutputHeight,
nTilePosX, nTilePosY, nTileWidth, nTileHeight );
commit 0a0238129a47c42c996f836bd48cee57b78a
Author: Jan Holesovsky
Date: Fri Apr 3 20:57:49 2015 +0200
sc tiled editing: Correct position of the selection in far positions.
Before this commit, the selections outside of the aScrSize rectangle did not
work - they always degraded to a single cell selection.
Change-Id: Ie51da710424bff3691302f5923b141a2f2bea676
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 7202f3d..a9c0135 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1554,23 +1554,35 @@ void ScGridWindow::GetSelectionRects( ::std::vector<
Rectangle >& rPixelRects )
SCCOL nPosX = pViewData->GetPosX( eHWhich );
SCROW nPosY = pViewData->GetPosY( eVWhich );
+// is the selection visible at all?
if (nTestX2 < nPosX || nTestY2 < nPosY)
-return; // unsichtbar
+return;
SCCOL nRealX1 = nX1;
if (nX1 < nPosX)
nX1 = nPosX;
if (nY1 < nPosY)
nY1 = nPosY;
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sc/source
sc/source/ui/view/gridwin3.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fa9f8daf78872ad194f21a664202b3908b0e4053
Author: Jan Holesovsky
Date: Fri Apr 3 23:51:21 2015 +0200
sc tiled editing: Don't crash on desktop.
Change-Id: I4cb63550b3913d097db63b374f0acbea591682e4
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index be017e3..925f473 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -243,7 +243,7 @@ MapMode ScGridWindow::GetDrawMapMode( bool bForce )
// work in the logic coordinates (ideally 100ths of mm - so that it is
// the same as editeng and drawinglayer), and get rid of all the
// SetMapMode's and other unneccessary fun we have with pixels
-if (pDoc->GetDrawLayer()->isTiledRendering())
+if (pDoc && pDoc->GetDrawLayer() &&
pDoc->GetDrawLayer()->isTiledRendering())
{
return pViewData->GetLogicMode();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[SOLVED] Re: tdf#90156: fail to launch LO on MacOs after building git sources
After having updated my local repo, it's ok now, see https://bugs.documentfoundation.org/show_bug.cgi?id=90156#c13 for details. Julien -- View this message in context: http://nabble.documentfoundation.org/tdf-90156-fail-to-launch-LO-on-MacOs-after-building-git-sources-tp4145185p4145355.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 6 commits - oox/source sc/source
oox/source/drawingml/chart/seriescontext.cxx | 11 ++-
oox/source/drawingml/chart/seriesconverter.cxx |4
oox/source/export/chartexport.cxx | 11 +++
sc/source/filter/excel/excdoc.cxx |4
sc/source/filter/excel/xelink.cxx | 15 ---
sc/source/filter/excel/xepage.cxx |7 ++-
sc/source/filter/inc/xepage.hxx|4
7 files changed, 43 insertions(+), 13 deletions(-)
New commits:
commit e2ed0c6e2729438a6512fc51fc0bfd6055e849f2
Author: Markus Mohrhard
Date: Sat Apr 4 04:07:36 2015 +0200
finally a good step in the direction of valid external data export
Change-Id: I22cbcb9d1f15ab18a8d70c1793c64f04f27389a2
diff --git a/sc/source/filter/excel/xelink.cxx
b/sc/source/filter/excel/xelink.cxx
index 454c918..7962745 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -1683,14 +1683,20 @@ void XclExpSupbook::SaveXml( XclExpXmlStream& rStrm )
}
-if (!maXctList.IsEmpty() || mxExtNameBfr)
+if (mxExtNameBfr)
+{
+pExternalLink->startElement(XML_definedNames, FSEND);
+// externalName elements
+WriteExtNameBufferXml( rStrm );
+pExternalLink->endElement(XML_definedNames);
+}
+
+if (!maXctList.IsEmpty())
{
pExternalLink->startElement( XML_sheetDataSet, FSEND);
// sheetData elements
maXctList.SaveXml( rStrm );
-// externalName elements
-WriteExtNameBufferXml( rStrm );
pExternalLink->endElement( XML_sheetDataSet);
commit 1b15733a87462f7075190e5344e6d8e0b46345ca
Author: Markus Mohrhard
Date: Sat Apr 4 04:06:49 2015 +0200
document when we are going to create invalid OOXML documents
That makes my life so much easier when I need to debug where we screw
up.
Change-Id: Ia0b54eef47a06c43e3d0ba66b909e398e02a6d0e
diff --git a/sc/source/filter/excel/xelink.cxx
b/sc/source/filter/excel/xelink.cxx
index f9e22a7..454c918 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -1390,7 +1390,10 @@ void XclExpXct::SaveXml( XclExpXmlStream& rStrm )
{
XclExpCrnList aCrnRecs;
if (!BuildCrnList( aCrnRecs))
+{
+SAL_WARN("sc", "generating invalid OOXML files: sheetDataSet without
sheetData child element");
return;
+}
sax_fastparser::FSHelperPtr pFS = rStrm.GetCurrentStream();
commit 78f4ed104c832b4aa1ae2d8d367f1db7de486065
Author: Markus Mohrhard
Date: Sat Apr 4 03:50:50 2015 +0200
correct xlsx element order, related tdf#59663
Change-Id: Iffb7a766f15475e3600332a6c76a15a1d192d7c8
diff --git a/sc/source/filter/excel/excdoc.cxx
b/sc/source/filter/excel/excdoc.cxx
index 2582712..c322625 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -673,6 +673,10 @@ void ExcTable::FillAsTableXml()
// all MSODRAWING and OBJ stuff of this sheet goes here
aRecList.AppendRecord( GetObjectManager().ProcessDrawing( GetSdrPage(
mnScTab ) ) );
+XclExpImgData* pImgData = xPageSett->getGraphicExport();
+if (pImgData)
+aRecList.AppendRecord(std::shared_ptr(pImgData));
+
aRecList.AppendRecord( xExtLst );
}
diff --git a/sc/source/filter/excel/xepage.cxx
b/sc/source/filter/excel/xepage.cxx
index d352025..a68f021 100644
--- a/sc/source/filter/excel/xepage.cxx
+++ b/sc/source/filter/excel/xepage.cxx
@@ -405,9 +405,14 @@ void XclExpPageSettings::SaveXml( XclExpXmlStream& rStrm )
static_cast< sal_uInt16 >( GetXclMaxPos().Col() )
).SaveXml( rStrm );
XclExpPageBreaks( EXC_ID_VERPAGEBREAKS, maData.maVerPageBreaks,
static_cast< sal_uInt16 >( GetXclMaxPos().Row() )
).SaveXml( rStrm );
+}
+XclExpImgData* XclExpPageSettings::getGraphicExport()
+{
if( const Graphic* pGraphic = maData.mxBrushItem->GetGraphic() )
-XclExpImgData( *pGraphic, EXC_ID8_IMGDATA ).SaveXml( rStrm );
+return new XclExpImgData( *pGraphic, EXC_ID8_IMGDATA );
+
+return NULL;
}
XclExpChartPageSettings::XclExpChartPageSettings( const XclExpRoot& rRoot ) :
diff --git a/sc/source/filter/inc/xepage.hxx b/sc/source/filter/inc/xepage.hxx
index 2df9be9..ea1d82c 100644
--- a/sc/source/filter/inc/xepage.hxx
+++ b/sc/source/filter/inc/xepage.hxx
@@ -24,6 +24,8 @@
#include "xlpage.hxx"
#include "xeroot.hxx"
+class XclExpImgData;
+
// Page settings records ==
// Header/footer --
@@ -100,6 +102,8 @@ public:
virtual voidSave( XclExpStream& rStrm ) SAL_OVERRIDE;
virtual voidSaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE;
+XclExpImgData* getGraphicExport();
+
private:
XclPageData maData; /// Page settings data.
};
commit 4ca0ca862fcfb81a500b52f4ae6454d949d8681c
Author: Markus
LibreOffice Gerrit News for core on 2015-04-04
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + Breeze: Page property icons in https://gerrit.libreoffice.org/15145 from Andreas Kainz about module icon-themes + OS X: use --libdir instead of --prefix in https://gerrit.libreoffice.org/12095 from Robert Antoni Buj i Gelonch about module external + enhancement : tdf#90225 Cannot open compressed csv files from calc in https://gerrit.libreoffice.org/15108 from Dennis Francis about module build, config_host, filter, include, sc, tools End of freshness + tdf#56467: copy text of meta actions with correct text length in https://gerrit.libreoffice.org/15144 from Christina Roßmanith about module filter + tdf#90133 Extend ODF: variable decimal in scientific format in https://gerrit.libreoffice.org/15135 from Laurent BP about module include, xmloff * Merged changes on master for project core changed in the last 25 hours: + Fix "unknown factory" log, declare and use FACTORYNAME_BASIC in https://gerrit.libreoffice.org/15113 from Julien Nabet + tdf#51460 Calc fails to set undo step after changing image anchor mode in https://gerrit.libreoffice.org/14489 from Henry Castro + Parallelized update precompiled headers. in https://gerrit.libreoffice.org/14802 from Ashod Nakashian + tdf#90403 PPTX import: use real table size in https://gerrit.libreoffice.org/15123 from Andras Timar * Abandoned changes on master for project core changed in the last 25 hours: + tdf#89392 Allow CJK characters to be rotated in 270 degree. in https://gerrit.libreoffice.org/14662 from Mark Hung * Open changes needing tweaks, but being untouched for more than a week: + WIP fdo#72987 Use firebird backup format for .odb no need for rebuild ind in https://gerrit.libreoffice.org/14968 from Popa Adrian Marius + Upgrade firebird to 2.5.3 , a few patches are already applied upstream in https://gerrit.libreoffice.org/15026 from Popa Adrian Marius + more breeze icons in https://gerrit.libreoffice.org/13058 from Jonathan Riddell + tdf#90222: replace ScaList in scaddins with a std container in https://gerrit.libreoffice.org/15012 from Pieter Adriaensen + Removed unnecessary variables which occupy space in https://gerrit.libreoffice.org/14951 from Karthick Prasad + Fixed all postfix operator++ and operator-- in https://gerrit.libreoffice.org/14975 from Ahmad Samir + tdf#39468 Translate German Comments - sc/source/core/data/ in https://gerrit.libreoffice.org/14866 from Christian M. Heller + tdf#49893: final fix for blank rectangle problem in https://gerrit.libreoffice.org/14584 from Vasily Melenchuk + xmloff: convert xof.component to use constructor syntax in https://gerrit.libreoffice.org/14820 from Chris Sherlock + xmloff: use constructor syntax in xo.component in https://gerrit.libreoffice.org/14803 from Chris Sherlock + sd: use constructor syntax for rest of sd.component in https://gerrit.libreoffice.org/14689 from Chris Sherlock + embeddedobj: convert emboleobj.*.component to constructor syntax in https://gerrit.libreoffice.org/14687 from Chris Sherlock + sc: use constructor syntax in sc.component in https://gerrit.libreoffice.org/14750 from Chris Sherlock + Convert ScDocument to constructor syntax, remove sc_component_getFactory( in https://gerrit.libreoffice.org/14751 from Chris Sherlock + scaddins: use constructor syntax for date.component in https://gerrit.libreoffice.org/14707 from Chris Sherlock + scaddins: use constructor syntax for pricing.component in https://gerrit.libreoffice.org/14706 from Chris Sherlock + scaddins: use constructor syntax for analysis.component in https://gerrit.libreoffice.org/14708 from Chris Sherlock + package: use constructor syntax in xstor.component in https://gerrit.libreoffice.org/14757 from Chris Sherlock + xmlsecurity: use constructor syntax in xsec_xmlsec.component in https://gerrit.libreoffice.org/14758 from Chris Sherlock + BUG - tdf#38835 strip out non-trivial globals before main in https://gerrit.libreoffice.org/14830 from Karthick Prasad + Convert OS = LINUX conditionals to GUIBASE = unx. in https://gerrit.libreoffice.org/14790 from Ryo ONODERA + fdo#83672 , fdo#67776 : Fixed shape rotation angle in xlsx import. in https://gerrit.libreoffice.org/13090 from Sushil Shinde + tdf#85491 : break parameter incorrectly set in .XLSX import. in https://gerrit.libreoffice.org/12213 from Sushil Shinde + Drop MAC_OS_X_VERSION_... variables in https://gerrit.libreoffice.org/13212 from Douglas Mencken + jpeg-turbo: OpenCL for decompression of jpegs. in https://gerrit.libreoffice.org/13315 from Jan Holesovsky + GPU Calc:Support string parameter in SUMIF an SUMIFS. in https://gerrit.libreoffice.org/12044 from Hao Chen + wip: get rid of svx dbtoolsclient in https://gerrit.libreoffice.org/11737 from Lionel Elie Mamane + Fix typo code Persistant in https://gerrit.libreoffice.org/14030 from Andr
[Libreoffice-commits] core.git: icon-themes/breeze
icon-themes/breeze/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/column1_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/column2_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/column3_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/column_L_1_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/column_L_2_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/column_L_3_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/column_L_left_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/column_L_right_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/columncopy_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/columnleft_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/columnright_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/format_L_nomal_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/format_L_wide_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/formatcopy_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/formatmirror_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/formatnarrow_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/formatnormal_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/formatwide_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/last_custom_common.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/last_custom_common_grey.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png |binary 40 files changed New commits: commit 78d8ce93d738daa48b12c0a213d9f2687d3f6104 Author: andreas_k Date: Sat Apr 4 03:03:31 2015 +0200 Breeze: Page property icons Change-Id: I15ed795340c73b2d12b0e93990ede5a1e7284533 Reviewed-on: https://gerrit.libreoffice.org/15145 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/icon-themes/breeze/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png b/icon-themes/breeze/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png new file mode 100644 index 000..dc35412 Binary files /dev/null and b/icon-themes/breeze/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png differ diff --git a/icon-themes/breeze/sw/res/sidebar/pageproppanel/column1_24x24.png b/icon-themes/breeze/sw/res/sidebar/pageproppanel/column1_24x24.png new file mode 100644 index 000..2483e39 Binary files /dev/null and b/icon-themes/breeze/sw/res/sidebar/pageproppanel/column1_24x24.png differ diff --git a/icon-themes/breeze/sw/res/sidebar/pageproppanel/column2_24x24.png b/icon-themes/breeze/sw/res/sidebar/pageproppanel/column2_24x24.png new file mode 100644 index 000..9878c55 Binary files /dev/null and b/icon-themes/breeze/sw/res/sidebar/pageproppanel/column2_24x24.png differ diff --git a/icon-themes/breeze/sw/res/sidebar/pageproppanel/column3_24x24.png b/icon-themes/breeze/sw/res/sidebar/pageproppanel/column3_24x24.png new file mode 100644 index 000..6905d5c Binary files /dev/null and b/
Re: Minutes of the Design Hangout: 2015-03-25 [now really :-)]
Hi, On Sat, Apr 4, 2015 at 3:46 AM, Jan Holesovsky wrote: > + Kendy: https://bugs.freedesktop.org/show_bug.cgi?id=87794 > + check how the sliders in the Audio/Video toolbar are implemented > to move them to sidebar I have recently added support for sliders into VclBuilder so they map to GtkScale in glade, but I did not (yet) used them anywhere. I guess it should be easy to put them into Sidebar now. http://cgit.freedesktop.org/libreoffice/core/commit/?id=c63497472b6b7406a07840ec312ccebe6154bb86 Regards, Tomaž ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
