Re: [libreoffice-l10n] [ANN] LibreOffice 4.0.0 Beta2 available
On 01/13/2013 09:36 AM, Serg Bormant wrote: but as I can see, main.xcd contains zero mentions of GnomeVFSContentProvider: $ grep -ci GnomeVFSContentProvider share/registry/main.xcd 0 [...] Message box still here: LOdev 4.0 - Fatal Error The application cannot be started. unsatisfied query for interface of type com.sun.star.ucb.XContentProvider! Oh, sorry, the GnomeVFSContentProvider is not added to the UCB via the normal configuration mechanism, but via explicit code in configureUcb (desktop/source/app/appinit.cxx). That means you cannot easily fake an --enable-gnome-vfs build into a --disable-gnome-vfs one by just tweaking some configuration files. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: basic/source
basic/source/classes/sbxmod.cxx | 97 +++---
basic/source/runtime/iosys.cxx|2
basic/source/runtime/methods1.cxx | 37 +++---
basic/source/runtime/runtime.cxx |7 +-
4 files changed, 73 insertions(+), 70 deletions(-)
New commits:
commit d4bca924dd7ebe1b57f15de3e741f0fffcb67225
Author: Radu Ioan ioan.rad...@gmail.com
Date: Wed Jan 9 00:14:10 2013 +0200
fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
- Clean up OSL_
- Clean up DBG_
- Clean up OUString
Change-Id: I002d17ffbbd8371b0518ede34931b2eea30865a3
Reviewed-on: https://gerrit.libreoffice.org/1602
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index dc66887..33abb26 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -37,6 +37,7 @@
#include sbunoobj.hxx
#include svtools/syntaxhighlight.hxx
+#include sal/log.hxx
#include basic/basrdll.hxx
#include osl/mutex.hxx
@@ -162,7 +163,7 @@ DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) :
m_pMod( pVar ), mName( pV
}
catch(const Exception )
{
-OSL_FAIL( DocObjectWrapper::DocObjectWrapper: Caught
exception! );
+SAL_WARN( basic, DocObjectWrapper::DocObjectWrapper:
Caught exception! );
}
}
@@ -188,19 +189,19 @@ void SAL_CALL
DocObjectWrapper::acquire() throw ()
{
osl_atomic_increment( m_refCount );
-OSL_TRACE(DocObjectWrapper::acquire(%s) 0x%x refcount is now %d,
rtl::OUStringToOString( mName, RTL_TEXTENCODING_UTF8 ).getStr(), this,
m_refCount );
+SAL_INFO(basic,DocObjectWrapper::acquire( OUStringToOString( mName,
RTL_TEXTENCODING_UTF8 ).getStr() ) 0x this refcount is now
m_refCount );
}
void SAL_CALL
DocObjectWrapper::release() throw ()
{
if ( osl_atomic_decrement( m_refCount ) == 0 )
{
-OSL_TRACE(DocObjectWrapper::release(%s) 0x%x refcount is now %d,
rtl::OUStringToOString( mName, RTL_TEXTENCODING_UTF8 ).getStr(), this,
m_refCount );
+SAL_INFO(basic,DocObjectWrapper::release( OUStringToOString(
mName, RTL_TEXTENCODING_UTF8 ).getStr() ) 0x this refcount is now
m_refCount );
delete this;
}
else
{
-OSL_TRACE(DocObjectWrapper::release(%s) 0x%x refcount is now %d,
rtl::OUStringToOString( mName, RTL_TEXTENCODING_UTF8 ).getStr(), this,
m_refCount );
+SAL_INFO(basic,DocObjectWrapper::release( OUStringToOString(
mName, RTL_TEXTENCODING_UTF8 ).getStr() ) 0x this refcount is now
m_refCount );
}
}
@@ -266,7 +267,7 @@ DocObjectWrapper::invoke( const OUString aFunctionName,
const Sequence Any
sal_Int32 nSbxCount = n - 1;
if ( nParamsCount nSbxCount - nSbxOptional )
{
-throw RuntimeException( OUString( wrong number of parameters!
), Reference XInterface () );
+throw RuntimeException( wrong number of parameters!, Reference
XInterface () );
}
}
// set parameters
@@ -451,7 +452,7 @@ uno::Reference vba::XVBACompatibility
getVBACompatibility( const uno::Referen
try
{
uno::Reference beans::XPropertySet xModelProps( rxModel,
uno::UNO_QUERY_THROW );
-xVBACompat.set( xModelProps-getPropertyValue( OUString(
BasicLibraries ) ), uno::UNO_QUERY );
+xVBACompat.set( xModelProps-getPropertyValue( BasicLibraries ),
uno::UNO_QUERY );
}
catch(const uno::Exception )
{
@@ -494,7 +495,7 @@ IMPL_LINK( AsyncQuitHandler, OnAsyncQuit, void*, /*pNull*/ )
// could be found from other module.
SbModule::SbModule( const OUString rName, sal_Bool bVBACompat )
- : SbxObject( OUString(StarBASICModule) ),
+ : SbxObject( StarBASICModule ),
pImage( NULL ), pBreaks( NULL ), pClassData( NULL ), mbVBACompat(
bVBACompat ), pDocObject( NULL ), bIsProxyModule( false )
{
SetName( rName );
@@ -502,7 +503,7 @@ SbModule::SbModule( const OUString rName, sal_Bool
bVBACompat )
SetModuleType( script::ModuleType::NORMAL );
// #i92642: Set name property to intitial name
-SbxVariable* pNameProp = pProps-Find( OUString(Name), SbxCLASS_PROPERTY
);
+SbxVariable* pNameProp = pProps-Find( Name, SbxCLASS_PROPERTY );
if( pNameProp != NULL )
{
pNameProp-PutString( GetName() );
@@ -511,7 +512,7 @@ SbModule::SbModule( const OUString rName, sal_Bool
bVBACompat )
SbModule::~SbModule()
{
-OSL_TRACE(Module named %s is destructing, rtl::OUStringToOString(
GetName(), RTL_TEXTENCODING_UTF8 ).getStr() );
+SAL_INFO(basic,Module named OUStringToOString( GetName(),
RTL_TEXTENCODING_UTF8 ).getStr() is destructing);
delete pImage;
delete pBreaks;
delete pClassData;
@@ -524,7 +525,7 @@ SbModule::GetUnoModule()
if ( !mxWrapper.is() )
mxWrapper
[PUSHED] fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1602 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1602 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I002d17ffbbd8371b0518ede34931b2eea30865a3 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ioan Radu ioan.rad...@gmail.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [libreoffice-l10n] [ANN] LibreOffice 4.0.0 Beta2 available
On Mon, 2013-01-14 at 09:05 +0100, Stephan Bergmann wrote: Oh, sorry, the GnomeVFSContentProvider is not added to the UCB via the normal configuration mechanism, but via explicit code in configureUcb (desktop/source/app/appinit.cxx). That means you cannot easily fake an --enable-gnome-vfs build into a --disable-gnome-vfs one by just tweaking some configuration files. Heh - on the other hand we should prolly catch discard all exceptions from the horrible hack that is desktop/source/app/appinit.cxx - which is IIRC a startup / performance disaster we'd be well rid of as well :-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: instsetoo_native/util Makefile.in solenv/inc
Makefile.in |2 ++
instsetoo_native/util/.gitignore |1 +
solenv/inc/.gitignore|1 +
3 files changed, 4 insertions(+)
New commits:
commit cb50efb8cbff5bd40b713cc86fb00c1870f4a160
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Jan 14 11:05:50 2013 +0100
Ignore and distclean generated files
(Modelling .gitignore-per-directory instead of a single one in the root dir
after exisiting config/.gitignore. No idea which approach is better.)
Change-Id: I0ae90103ada4bfff48e90afcf3903bd3ba909314
diff --git a/Makefile.in b/Makefile.in
index d114d81..a383ecd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -194,6 +194,8 @@ endif
$(BUILDDIR)/config_host.mk.last \
$(BUILDDIR)/config_host.mk.stamp \
$(BUILDDIR)/configure \
+$(BUILDDIR)/instsetoo_native/util/openoffice.lst \
+$(BUILDDIR)/solenv/inc/minor.mk \
$(BUILDDIR)/warn
find $(SOLARENV)/gdb -name *.pyc -exec rm {} \;
diff --git a/instsetoo_native/util/.gitignore b/instsetoo_native/util/.gitignore
new file mode 100644
index 000..0ed9535
--- /dev/null
+++ b/instsetoo_native/util/.gitignore
@@ -0,0 +1 @@
+/openoffice.lst
diff --git a/solenv/inc/.gitignore b/solenv/inc/.gitignore
new file mode 100644
index 000..b8fab61
--- /dev/null
+++ b/solenv/inc/.gitignore
@@ -0,0 +1 @@
+/minor.mk
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sw/source
sw/source/core/undo/unins.cxx | 21 +
1 file changed, 21 insertions(+)
New commits:
commit b825f95fa100f2a54032ec5a1ff51de0db17ea1d
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jan 11 17:32:18 2013 +0100
fdo#53487 SwUndoInsert: take care of fieldmarks when deleting field chars
The problem was that while SwUndoInsert removed the field characters, it
didn't remove the fieldmark, so after unding a comment insert, it wasn't
possible to re-insert a comment.
(cherry picked from commit ecce43877167c1cd6e24208208aed4274100c11a)
Change-Id: If42b0992be29e3336b8e9d736497e4fb09184c55
Reviewed-on: https://gerrit.libreoffice.org/1652
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index d1cef84..03cc454 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -25,6 +25,7 @@
#include sot/storage.hxx
#include editeng/keepitem.hxx
#include svx/svdobj.hxx
+#include xmloff/odffields.hxx
#include docsh.hxx
#include fmtcntnt.hxx
@@ -250,6 +251,26 @@ void SwUndoInsert::UndoImpl(::sw::UndoRedoContext
rContext)
RemoveIdxFromRange( aPaM, sal_False );
pTxt = new String( pTxtNode-GetTxt().Copy(nCntnt-nLen, nLen)
);
pTxtNode-EraseText( aPaM.GetPoint()-nContent, nLen );
+
+// Undo deletes fieldmarks in two step: first the end then the
start position.
+// Once the start position is deleted, make sure the fieldmark
itself is deleted as well.
+if (nLen == 1)
+{
+IDocumentMarkAccess* const pMarkAccess =
pTmpDoc-getIDocumentMarkAccess();
+for ( IDocumentMarkAccess::const_iterator_t i =
pMarkAccess-getMarksBegin(); i != pMarkAccess-getMarksEnd(); ++i)
+{
+sw::mark::IMark* pMark = i-get();
+if (pMark-GetMarkStart() == *aPaM.GetPoint()
pMark-GetMarkStart().nContent == aPaM.GetPoint()-nContent)
+{
+sw::mark::IFieldmark* pFieldmark =
dynamic_castsw::mark::IFieldmark*(pMark);
+if (pFieldmark pFieldmark-GetFieldname() ==
ODF_COMMENTRANGE)
+{
+
pTmpDoc-getIDocumentMarkAccess()-deleteMark(pMark);
+break;
+}
+}
+}
+}
}
else// otherwise Graphics/OLE/Text/...
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-4-0]: fdo#53487 SwUndoInsert: take care of fieldmarks when deletin...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1652 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1652 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If42b0992be29e3336b8e9d736497e4fb09184c55 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [master] installer issue in Windows
Hi Mat, On Sun, 2013-01-13 at 01:53 +0100, Mat M wrote: Trying to build from 484bb96aa975, I got an error when doing install sets. Here is the short error message from instsetoo_native: Ah - that is annoying. This means that your setup_osl.bin that should be in the solver/ mentions these things but they have not been built. Perhaps you changed your configure options after building 'scp2' ? try: make scp2.clean make scp2 make scp2.deliver or somesuch. Failing that - manually hack the setup_osl.bin to remove these files (the references to them don't matter so much though). You're nearly there :-) HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c87be4c207e98b8449cc66a7eea7e1a6e3140ba9 Author: Andras Timar ati...@suse.com Date: Mon Jan 14 11:41:58 2013 +0100 Updated core Project: dictionaries 0f7aa36b2804a7934b4089e50f4225264c46c806 diff --git a/dictionaries b/dictionaries index 9cfd428..0f7aa36 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 9cfd4282a7a522bed2dc4f4b9ede2c8ee444c29b +Subproject commit 0f7aa36b2804a7934b4089e50f4225264c46c806 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - vcl/inc vcl/source
vcl/inc/vcl/combobox.hxx| 11
vcl/source/control/combobox.cxx | 107 +++-
2 files changed, 73 insertions(+), 45 deletions(-)
New commits:
commit c246579a807946e649ec009eba320b69ff56c03e
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 11 16:35:17 2013 +
split out the ComboBox code that determines the positioning of subwidgets
and re-use it to get a better calculation of the optimal size of a
widget, rather than taking the current position of the subedit
the upshot of this is that with CTL and/or CJK mode enabled in...
a) calc, then the format-cells font dialog doesn't have squashed font size
and
font style listboxes
b) writer, the 10.5 default size for CJK doesn't have part of the .5 clipped
off it
the calcComboBoxDropDownComponentBounds code should be entirely equivalent
to the existing ::Resize calculation given the same input, we just call
it with effectively unbounded available size in the GetOptimalSize case
to find the desired margins around the subedit field
(cherry picked from commit d19eab221f168aed12249ffc8a36a9f1aca5a94e)
Change-Id: I85cb3ff98f23d21d7cfdcc28188e36616a19b5e8
Reviewed-on: https://gerrit.libreoffice.org/1657
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/vcl/inc/vcl/combobox.hxx b/vcl/inc/vcl/combobox.hxx
index d1704dc..72478c5 100644
--- a/vcl/inc/vcl/combobox.hxx
+++ b/vcl/inc/vcl/combobox.hxx
@@ -50,9 +50,20 @@ private:
LinkmaSelectHdl;
LinkmaDoubleClickHdl;
+struct ComboBoxBounds
+{
+Point aSubEditPos;
+Size aSubEditSize;
+
+Point aButtonPos;
+Size aButtonSize;
+};
+
private:
SAL_DLLPRIVATE void ImplInitComboBoxData();
SAL_DLLPRIVATE void ImplUpdateFloatSelection();
+SAL_DLLPRIVATE ComboBoxBounds calcComboBoxDropDownComponentBounds(
+const Size rOutSize, const Size rBorderOutSize) const;
DECL_DLLPRIVATE_LINK( ImplSelectHdl, void* );
DECL_DLLPRIVATE_LINK( ImplCancelHdl, void* );
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index a0f8982..389929c3 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -597,50 +597,10 @@ void ComboBox::Resize()
Size aOutSz = GetOutputSizePixel();
if( IsDropDownBox() )
{
-longnTop = 0;
-longnBottom = aOutSz.Height();
-
-Window *pBorder = GetWindow( WINDOW_BORDER );
-ImplControlValue aControlValue;
-Point aPoint;
-Rectangle aContent, aBound;
-
-// use the full extent of the control
-Rectangle aArea( aPoint, pBorder-GetOutputSizePixel() );
-
-if ( GetNativeControlRegion(CTRL_COMBOBOX, PART_BUTTON_DOWN,
-aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) )
-{
-// convert back from border space to local coordinates
-aPoint = pBorder-ScreenToOutputPixel( OutputToScreenPixel( aPoint
) );
-aContent.Move(-aPoint.X(), -aPoint.Y());
-
-mpBtn-setPosSizePixel( aContent.Left(), nTop,
aContent.getWidth(), (nBottom-nTop) );
-
-// adjust the size of the edit field
-if ( GetNativeControlRegion(CTRL_COMBOBOX, PART_SUB_EDIT,
-aArea, 0, aControlValue, rtl::OUString(), aBound,
aContent) )
-{
-// convert back from border space to local coordinates
-aContent.Move(-aPoint.X(), -aPoint.Y());
-
-// use the themes drop down size
-mpSubEdit-SetPosSizePixel( aContent.TopLeft(),
aContent.GetSize() );
-}
-else
-{
-// use the themes drop down size for the button
-aOutSz.Width() -= aContent.getWidth();
-mpSubEdit-SetSizePixel( aOutSz );
-}
-}
-else
-{
-long nSBWidth =
GetSettings().GetStyleSettings().GetScrollBarSize();
-nSBWidth = CalcZoom( nSBWidth );
-mpSubEdit-SetPosSizePixel( Point( 0, 0 ), Size( aOutSz.Width() -
nSBWidth, aOutSz.Height() ) );
-mpBtn-setPosSizePixel( aOutSz.Width() - nSBWidth, nTop, nSBWidth,
(nBottom-nTop) );
-}
+ComboBoxBounds aBounds(calcComboBoxDropDownComponentBounds(aOutSz,
+GetWindow(WINDOW_BORDER)-GetOutputSizePixel()));
+mpSubEdit-SetPosSizePixel(aBounds.aSubEditPos, aBounds.aSubEditSize);
+mpBtn-SetPosSizePixel(aBounds.aButtonPos, aBounds.aButtonSize);
}
else
{
@@ -1106,12 +1066,15 @@ Size ComboBox::CalcMinimumSize() const
else
{
aSz.Height() = Edit::CalcMinimumSizeForText(GetText()).Height();
+
aSz.Width() = mpImplLB-GetMaxEntryWidth();
aSz.Width() +=
[PUSHED] Change in core[libreoffice-4-0]: split out the ComboBox code that determines the positioning ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1657 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1657 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I85cb3ff98f23d21d7cfdcc28188e36616a19b5e8 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - vcl/source
vcl/source/window/split.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 2bafa7dacd6ddb9045f5327762334f323f46b1b0
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sat Jan 12 05:29:25 2013 +0100
fix crash with new personas when notifying windows
Change-Id: I41e4c747c4662fb066746c0ca87d17ea6742080e
Reviewed-on: https://gerrit.libreoffice.org/1658
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index 4877004..9e79c8f 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -729,7 +729,11 @@ void Splitter::DataChanged( const DataChangedEvent rDCEvt
)
Window::DataChanged( rDCEvt );
if( rDCEvt.GetType() == DATACHANGED_SETTINGS )
{
-Color oldFaceColor = ((AllSettings *)
rDCEvt.GetData())-GetStyleSettings().GetFaceColor();
+AllSettings* pOldSettings =
static_castAllSettings*(rDCEvt.GetData());
+if(!pOldSettings)
+return;
+
+Color oldFaceColor = pOldSettings-GetStyleSettings().GetFaceColor();
Color newFaceColor =
Application::GetSettings().GetStyleSettings().GetFaceColor();
if( oldFaceColor.IsDark() != newFaceColor.IsDark() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-4-0]: fix crash with new personas when notifying windows
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1658 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1658 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I41e4c747c4662fb066746c0ca87d17ea6742080e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW-4-0] oxygen-gtk support version ...
Hi, On Fri, Jan 11, 2013 at 10:45 PM, Noel Power nopo...@suse.com wrote: On 10/01/13 17:41, Michael Meeks wrote: Hi there, I cleaned up the version bits (as well as I could in a back-portable way for 4.0 - really we should drive this all from one setting in configure.in IMHO). I'd like to get the result into -4-0 if someone could review/ pick these two: http://cgit.freedesktop.org/libreoffice/core/commit/?id=364cce0a511d3e7a3bbc51e09895999fbdf0dbe1 http://cgit.freedesktop.org/libreoffice/core/commit/?id=0260f0b256c3675bb6d836c0a2babb7626577b7a And hopefully it'd be possible (any chance you could do that Tor?) to file an easy-hack to kill remaining code-based 'SUPD' uses to use LIBO_VERSION_ bits ok, these didn't cherry-pick cleanly, I manaully changed the add LIBO_VERSION_* macros and a config header for them to live in. patch. After that it didn't build so I added add config path for commit bf85d5eb33ff33c9ff94336de9d9f67825296c10 I don't feel confident pushing this on a friday afternoon, if anyone else wants to test and try ( say on windows ) then that might be an idea :-) note: builds for me ok on linux. If not I will push on Monday Tested on Linux, builds OK and works OK with oxygen-gtk2 master. Noel Regards, Ruslan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - basctl/source
basctl/source/basicide/baside2b.cxx | 16
basctl/source/basicide/layout.cxx |5 +++--
basctl/source/basicide/linenumberwindow.cxx |3 ++-
3 files changed, 13 insertions(+), 11 deletions(-)
New commits:
commit ab6725a03bd32f1320a53c17de9682eecdbf59c0
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sat Jan 12 06:39:31 2013 +0100
fix a bunch of more crashes when setting personas
Change-Id: I6c2c398e074a41c3173bff57bc12496b4c2032b4
Reviewed-on: https://gerrit.libreoffice.org/1659
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index e4d7350..ffa93e4 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -666,8 +666,8 @@ void EditorWindow::DataChanged(DataChangedEvent const
rDCEvt)
(rDCEvt.GetFlags() SETTINGS_STYLE) != 0)
{
Color aColor(GetSettings().GetStyleSettings().GetFieldColor());
-if (aColor
-!= rDCEvt.GetOldSettings()-GetStyleSettings().GetFieldColor())
+const AllSettings* pOldSettings = rDCEvt.GetOldSettings();
+if (!pOldSettings || aColor !=
pOldSettings-GetStyleSettings().GetFieldColor())
{
SetBackground(Wallpaper(aColor));
Invalidate();
@@ -675,8 +675,8 @@ void EditorWindow::DataChanged(DataChangedEvent const
rDCEvt)
if (pEditEngine != 0)
{
aColor = GetSettings().GetStyleSettings().GetFieldTextColor();
-if (aColor != rDCEvt.GetOldSettings()-
-GetStyleSettings().GetFieldTextColor())
+if (!pOldSettings || aColor !=
+pOldSettings- GetStyleSettings().GetFieldTextColor())
{
Font aFont(pEditEngine-GetFont());
aFont.SetColor(aColor);
@@ -1166,8 +1166,8 @@ void BreakPointWindow::DataChanged(DataChangedEvent const
rDCEvt)
(rDCEvt.GetFlags() SETTINGS_STYLE) != 0)
{
Color aColor(GetSettings().GetStyleSettings().GetFieldColor());
-if (aColor
-!= rDCEvt.GetOldSettings()-GetStyleSettings().GetFieldColor())
+const AllSettings* pOldSettings = rDCEvt.GetOldSettings();
+if (!pOldSettings || aColor !=
pOldSettings-GetStyleSettings().GetFieldColor())
{
setBackgroundColor(aColor);
Invalidate();
@@ -1690,8 +1690,8 @@ void ComplexEditorWindow::DataChanged(DataChangedEvent
const rDCEvt)
(rDCEvt.GetFlags() SETTINGS_STYLE) != 0)
{
Color aColor(GetSettings().GetStyleSettings().GetFaceColor());
-if (aColor
-!= rDCEvt.GetOldSettings()-GetStyleSettings().GetFaceColor())
+const AllSettings* pOldSettings = rDCEvt.GetOldSettings();
+if (!pOldSettings || aColor !=
pOldSettings-GetStyleSettings().GetFaceColor())
{
SetBackground(Wallpaper(aColor));
Invalidate();
diff --git a/basctl/source/basicide/layout.cxx
b/basctl/source/basicide/layout.cxx
index e679a4f..344345f 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -135,13 +135,14 @@ void Layout::DataChanged (DataChangedEvent const rDCEvt)
{
bool bInvalidate = false;
Color aColor = GetSettings().GetStyleSettings().GetWindowColor();
-if (aColor !=
rDCEvt.GetOldSettings()-GetStyleSettings().GetWindowColor())
+const AllSettings* pOldSettings = rDCEvt.GetOldSettings();
+if (!pOldSettings || aColor !=
pOldSettings-GetStyleSettings().GetWindowColor())
{
SetBackground(Wallpaper(aColor));
bInvalidate = true;
}
aColor = GetSettings().GetStyleSettings().GetWindowTextColor();
-if (aColor !=
rDCEvt.GetOldSettings()-GetStyleSettings().GetWindowTextColor())
+if (!pOldSettings || aColor !=
pOldSettings-GetStyleSettings().GetWindowTextColor())
{
Font aFont(GetFont());
aFont.SetColor(aColor);
diff --git a/basctl/source/basicide/linenumberwindow.cxx
b/basctl/source/basicide/linenumberwindow.cxx
index 6e81075..79edc16 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -98,7 +98,8 @@ void LineNumberWindow::DataChanged(DataChangedEvent const
rDCEvt)
(rDCEvt.GetFlags() SETTINGS_STYLE) != 0)
{
Color aColor(GetSettings().GetStyleSettings().GetFieldColor());
-if (aColor !=
rDCEvt.GetOldSettings()-GetStyleSettings().GetFieldColor())
+const AllSettings* pOldSettings = rDCEvt.GetOldSettings();
+if (!pOldSettings || aColor !=
pOldSettings-GetStyleSettings().GetFieldColor())
{
SetBackground(Wallpaper(aColor));
Invalidate();
___
Libreoffice-commits mailing
[PUSHED] Change in core[libreoffice-4-0]: fix a bunch of more crashes when setting personas
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1659 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1659 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6c2c398e074a41c3173bff57bc12496b4c2032b4 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Papiamentu spellchecker, doesn't suggest some words with accents (à ò etc)
Olivier, thank you *very* much for your explanation and your links. Sorry that it took more then a year to find time to pusue this. My original .aff was: SET UTF-8 SFX P Y 1 SFX P 0 nan Now I am using SET UTF-8 TRY aieonstrkldmuphbgáfvèòcóíyéwñzjùúüABCSKIHEPLGTFxMJRqYXVDç SFX P Y 1 SFX P 0 nan and that is a great improvement! Unfortunately I don't now why that TRY should be in that order, why is ç in the end. I think I did a character frequency analysis, but not sure about that. What is the way to determine this TRY string? It did help, it now nows tog should be tòg and interesa should be interesá. Thanks and I want to learn more :-) Cheers ace - Original Message - From: Olivier R. olivier.nore...@gmail.com To: libreoffice@lists.freedesktop.org Sent: Thursday, November 24, 2011 9:53:46 AM Subject: Re: [Libreoffice] Papiamentu spellchecker, doesn't suggest some words with accents (à ò etc) Hello, Ace Suares (Suares amp; Co) wrote The problem is that when typing 'ana', which is wrong, the suggestion list does NOT include 'aña' (but more then 10 other useless suggestions). Use the command MAP to associate affiliated characters: MAP 1 MAP nñ Ace Suares (Suares amp; Co) wrote The same with 'toch' which should suggest 'tòg' REP 1 REP och òg Did you read this ? http://freefr.dl.sourceforge.net/project/hunspell/Hunspell/Documentation/hunspell4.pdf You can also have a look in other dictionaries: http://extensions.libreoffice.org/extension-center?getCompatibility=anypath=/LibreOffice-Extensions-and-Templates/extension-centerb_start:int=30portal_type=PSCProjectsort_on=positive_ratingsgetCategories=DictionarySearchableText= Regards, Olivier -- View this message in context: http://nabble.documentfoundation.org/Papiamentu-spellchecker-doesn-t-suggest-some-words-with-accents-a-o-etc-tp3533625p3533676.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 mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Papiamentu spellchecker, doesn't suggest some words with accents (à ò etc)
Hi Ace, Le 14/01/2013 00:04, Ace Suares a écrit : What is the way to determine this TRY string? Using a character frequency analysis is good. But the most important thing, imho, is to list every characters of your language. Actually, I don’t know much more than what is written in the documentation. Regards, Olivier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/source
sc/source/ui/src/condformatdlg.src |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 621b7451cf9cf16e29ff19f2cd11a06f6abbacc5
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sat Jan 12 07:31:03 2013 +0100
make the list box a bit larger, fdo#58609
Change-Id: I862ee7e20a7e534286785a12508a6442f78c
Reviewed-on: https://gerrit.libreoffice.org/1660
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sc/source/ui/src/condformatdlg.src
b/sc/source/ui/src/condformatdlg.src
index 22ca8fe..ae5fc86 100644
--- a/sc/source/ui/src/condformatdlg.src
+++ b/sc/source/ui/src/condformatdlg.src
@@ -113,9 +113,10 @@ Control RID_COND_ENTRY
ListBox LB_TYPE
{
Pos = MAP_APPFONT( 5, 15 );
-Size = MAP_APPFONT( 80, 40 );
+Size = MAP_APPFONT( 80, 60 );
Border = TRUE;
DropDown = TRUE;
+DDExtraWidth = TRUE;
StringList [ en-US ] =
{
All Cells;
@@ -130,6 +131,7 @@ Control RID_COND_ENTRY
Size = MAP_APPFONT( 80, 80 );
Border = TRUE;
DropDown = TRUE;
+DDExtraWidth = TRUE;
StringList [ en-US ] =
{
equal to;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-4-0]: make the list box a bit larger, fdo#58609
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1660 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1660 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I862ee7e20a7e534286785a12508a6442f78c Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 3 commits - config/config_version.h.in configure.ac solenv/gbuild vcl/inc vcl/source vcl/unx
config/config_version.h.in | 14 ++ configure.ac | 18 +- solenv/gbuild/platform/com_GCC_defs.mk |4 +++- solenv/gbuild/platform/com_MSC_class.mk |1 + vcl/inc/svdata.hxx |5 + vcl/source/app/svapp.cxx |4 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |4 vcl/unx/gtk/window/gtkframe.cxx |6 +- 8 files changed, 49 insertions(+), 7 deletions(-) New commits: commit f9112b4f3b1952d23290597963d63c92d5356352 Author: Noel Power noel.po...@suse.com Date: Fri Jan 11 18:38:47 2013 + add config path for commit bf85d5eb33ff33c9ff94336de9d9f67825296c10 Change-Id: Ib8dfd276246bc6bd157a63c26184991a9993c3c5 diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 21b34a9..437cdd3 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -157,7 +157,9 @@ gb_DEBUG_CFLAGS := $(GGDB2) $(FINLINE_LIMIT0) $(FNO_INLINE) gb_DEBUG_CXXFLAGS := $(FNO_DEFAULT_INLINE) -gb_LinkTarget_INCLUDE := $(subst -I. , ,$(SOLARINC)) +gb_LinkTarget_INCLUDE :=\ +$(subst -I. , ,$(SOLARINC)) \ +-I$(SRCDIR)/config \ ifeq ($(COM_GCC_IS_CLANG),TRUE) ifeq ($(COMPILER_PLUGIN_TOOL),) diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index d0b3cfc..72d63af 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -108,6 +108,7 @@ gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) gb_LinkTarget_INCLUDE :=\ $(subst -I. , ,$(SOLARINC)) \ $(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \ + -I$(SRCDIR)/config \ gb_LinkTarget_get_pdbfile = $(call gb_LinkTarget_get_target,)pdb/$(1).pdb commit 513f25c7efba23d76e1cbab37f560d8e82e9e821 Author: Michael Meeks michael.me...@suse.com Date: Thu Jan 10 17:15:37 2013 + add LIBO_VERSION_* macros and a config header for them to live in. Change-Id: Ia6735e3e7f3231722231e9d7a4c9839f08038b96 Signed-off-by: Noel Power noel.po...@suse.com diff --git a/config/config_version.h.in b/config/config_version.h.in new file mode 100644 index 000..caaa9c4 --- /dev/null +++ b/config/config_version.h.in @@ -0,0 +1,14 @@ +/* +Version settings + version 4.0.0.1 is Major.Minor.Micro.Patch +*/ + +#ifndef CONFIG_VERSION_H +#define CONFIG_VERSION_H + +#undef LIBO_VERSION_MAJOR +#undef LIBO_VERSION_MINOR +#undef LIBO_VERSION_MICRO +#undef LIBO_VERSION_PATCH + +#endif diff --git a/configure.ac b/configure.ac index 9da5b39..deb7163 100644 --- a/configure.ac +++ b/configure.ac @@ -4231,7 +4231,22 @@ SOURCEVERSION=OOO$UPD AC_SUBST(UPD) AC_SUBST(SOURCEVERSION) - +dnl === +dnl Grim-ness to export version number of LibreOffice to code +dnl this needs to be turned around and to be driven by configure +dnl === +LIBO_VERSION_MAJOR=`$GREP VERSIONMAJOR solenv/inc/minor.mk | sed s/^.*=//` +LIBO_VERSION_MINOR=`$GREP VERSIONMINOR solenv/inc/minor.mk | sed s/^.*=//` +LIBO_VERSION_MICRO=`$GREP VERSIONMICRO solenv/inc/minor.mk | sed s/^.*=//` +LIBO_VERSION_PATCH=`$GREP BUILD solenv/inc/minor.mk | sed s/^.*=//` +AC_SUBST(LIBO_VERSION_MAJOR) +AC_SUBST(LIBO_VERSION_MINOR) +AC_SUBST(LIBO_VERSION_MICRO) +AC_SUBST(LIBO_VERSION_PATCH) +AC_DEFINE_UNQUOTED(LIBO_VERSION_MAJOR,$LIBO_VERSION_MAJOR) +AC_DEFINE_UNQUOTED(LIBO_VERSION_MINOR,$LIBO_VERSION_MINOR) +AC_DEFINE_UNQUOTED(LIBO_VERSION_MICRO,$LIBO_VERSION_MICRO) +AC_DEFINE_UNQUOTED(LIBO_VERSION_PATCH,$LIBO_VERSION_PATCH) dnl === dnl Set the ENABLE_CRASHDUMP variable. @@ -12160,6 +12175,7 @@ else fi AC_CONFIG_FILES([config_host.mk]) +AC_CONFIG_HEADERS([config/config_version.h]) AC_OUTPUT # touch the config timestamp file commit 6f047915018e286b6f05d0e87866d5f18c9901cd Author: Michael Meeks michael.me...@suse.com Date: Thu Jan 10 17:38:18 2013 + export cleaned up dotted version in environment and GtkWindow user-data. Change-Id: If865127a9a5560f4b3636fb870699e2f3bac0e83 Signed-off-by: Noel Power noel.po...@suse.com diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index f7dcbd6..5c4ea0c 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -44,6 +44,11 @@ #include boost/unordered_map.hpp +#include config_version.h + +#define LIBO_VERSION_DOTTED (LIBO_VERSION_MAJOR . LIBO_VERSION_MINOR . \ + LIBO_VERSION_MICRO . LIBO_VERSION_PATCH) + struct ImplTimerData; struct ImplConfigData; class ImplDirectFontSubstitution; diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 6a799cd..49cc5a7 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -205,6 +205,10 @@ Application* GetpApp() Application::Application()
Re: [PUSHED][REVIEW-4-0] oxygen-gtk support version ...
On 14/01/13 11:07, Ruslan Kabatsayev wrote: Hi, On Fri, Jan 11, 2013 at 10:45 PM, Noel Power nopo...@suse.com wrote: On 10/01/13 17:41, Michael Meeks wrote: Hi there, I cleaned up the version bits (as well as I could in a back-portable way for 4.0 - really we should drive this all from one setting in configure.in IMHO). I'd like to get the result into -4-0 if someone could review/ pick these two: http://cgit.freedesktop.org/libreoffice/core/commit/?id=364cce0a511d3e7a3bbc51e09895999fbdf0dbe1 http://cgit.freedesktop.org/libreoffice/core/commit/?id=0260f0b256c3675bb6d836c0a2babb7626577b7a And hopefully it'd be possible (any chance you could do that Tor?) to file an easy-hack to kill remaining code-based 'SUPD' uses to use LIBO_VERSION_ bits ok, these didn't cherry-pick cleanly, I manaully changed the add LIBO_VERSION_* macros and a config header for them to live in. patch. After that it didn't build so I added add config path for commit bf85d5eb33ff33c9ff94336de9d9f67825296c10 I don't feel confident pushing this on a friday afternoon, if anyone else wants to test and try ( say on windows ) then that might be an idea :-) note: builds for me ok on linux. If not I will push on Monday Tested on Linux, builds OK and works OK with oxygen-gtk2 master. would have been happier if someone could have built on windows ( there is a windows specific part in the backport ) I had already tested at least the building on linux ( the runtime test was appreciated though :-)) ) pushed now Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/LinkTarget.mk | 16 solenv/gbuild/platform/com_GCC_class.mk | 12 ++-- solenv/gbuild/platform/com_MSC_class.mk |4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) New commits: commit fabae54c51c25dcb28febe8181de8a5ee360ce1b Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Jan 10 20:40:00 2013 +0100 append library specific compile flags at the end Change-Id: If9d4640b59dd411734a581c66f9310d31ab9fbb7 Reviewed-on: https://gerrit.libreoffice.org/1632 Tested-by: Norbert Thiebaud nthieb...@gmail.com Reviewed-by: Noel Power noel.po...@suse.com Tested-by: Noel Power noel.po...@suse.com diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 2fb94f0..38cece0 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -632,9 +632,9 @@ endif endef define gb_LinkTarget_add_cflags -$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS += $(2) +$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS_APPEND += $(2) ifeq ($(gb_FULLDEPS),$(true)) -$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS += $(2) +$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS_APPEND += $(2) endif endef @@ -648,11 +648,11 @@ endef define gb_LinkTarget_add_cxxflags $(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS += $(2) +$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS_APPEND += $(2) $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS += $(2) ifeq ($(gb_FULLDEPS),$(true)) -$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS += $(2) +$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS_APPEND += $(2) $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS += $(2) endif endef @@ -664,9 +664,9 @@ $$(call gb_Output_error,\ endef define gb_LinkTarget_add_objcxxflags -$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS += $(2) +$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS_APPEND += $(2) ifeq ($(gb_FULLDEPS),$(true)) -$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS += $(2) +$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS_APPEND += $(2) endif endef @@ -683,9 +683,9 @@ $$(call gb_Output_error,\ endef define gb_LinkTarget_add_objcflags -$(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS += $(2) +$(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS_APPEND += $(2) ifeq ($(gb_FULLDEPS),$(true)) -$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCFLAGS += $(2) +$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCFLAGS_APPEND += $(2) endif endef diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 350e000..4ea1a14 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -65,7 +65,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \ $(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \ $(if $(COMPILER_PLUGINS),$(gb_COMPILER_PLUGINS)) \ - $(T_CFLAGS) \ + $(T_CFLAGS) $(T_CFLAGS_APPEND) \ -c $(3) \ -o $(1) \ $(call gb_cxx_dep_generation_options,$(1),$(4)) \ @@ -83,7 +83,7 @@ $(call gb_Helper_abbreviate_dirs,\ ICECC=no CCACHE_DISABLE=1 \ $(gb_CC) \ $(DEFS) \ - $(T_CFLAGS) \ + $(T_CFLAGS) $(T_CFLAGS_APPEND) \ -c $(2) \ -I$(dir $(2)) \ $(INCLUDE) \ @@ -105,7 +105,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \ $(if $(WARNINGS_NOT_ERRORS),,$(gb_CXXFLAGS_WERROR)) \ $(if $(COMPILER_PLUGINS),$(gb_COMPILER_PLUGINS)) \ - $(T_CXXFLAGS) \ + $(T_CXXFLAGS) $(T_CXXFLAGS_APPEND) \ -c $(3) \ -o $(1) \ $(call gb_cxx_dep_generation_options,$(1),$(4)) \ @@ -124,7 +124,7 @@ $(call gb_Helper_abbreviate_dirs,\ ICECC=no CCACHE_DISABLE=1 \ $(gb_CXX) \ $(DEFS) \ - $(T_CXXFLAGS) \ + $(T_CXXFLAGS) $(T_CXXFLAGS_APPEND) \ -c $(2) \ -I$(dir $(2)) \ $(INCLUDE) \ @@ -142,7 +142,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(DEFS) \ $(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \ $(if $(WARNINGS_NOT_ERRORS),,$(gb_CXXFLAGS_WERROR)) \ - $(T_OBJCXXFLAGS) \ + $(T_OBJCXXFLAGS) $(T_OBJCXXFLAGS_APPEND) \ -c $(3) \ -o $(1) \ -MMD -MT $(1) \ @@ -161,7 +161,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(DEFS) \ $(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \ $(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \ -
[Libreoffice-commits] .: 2 commits - scripting/source
scripting/source/pyprov/mailmerge.py | 33 +
1 file changed, 21 insertions(+), 12 deletions(-)
New commits:
commit 1a5b3d8e4d88aa27647cc7b99623dd6f6e706bbc
Author: Michael Stahl mst...@redhat.com
Date: Mon Jan 14 12:37:29 2013 +0100
fdo#59249: mailmerge.py: adapt to changes in smtplib:
Apparently the login() method in Python 3.3 expects str arguments for
user and password, since it calls encode on them, but for Python 2.6 the
encode calls were explicitly added in the caller since login() does
not encode itself; add an ugly version check for that.
Change-Id: Iebfce44073a837e9cb845855ba448d5b6a2ebd11
diff --git a/scripting/source/pyprov/mailmerge.py
b/scripting/source/pyprov/mailmerge.py
index 9dce4d3..b550c30 100755
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -99,9 +99,12 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
self.server.starttls()
self.server.ehlo()
- user = xAuthenticator.getUserName().encode('ascii')
- password = xAuthenticator.getPassword().encode('ascii')
- if user != b'':
+ user = xAuthenticator.getUserName()
+ password = xAuthenticator.getPassword()
+ if user != '':
+ if sys.version '3': # fdo#59249 i#105669 Python 2
needs ascii
+ user = user.encode('ascii')
+ password = password.encode('ascii')
if dbg:
print(Logging in, username of, user,
file=dbgout)
self.server.login(user, password)
@@ -279,9 +282,12 @@ class PyMailIMAPService(unohelper.Base, XMailService):
self.server = imaplib.IMAP4(server, port)
print(AFTER, file=dbgout)
- user = xAuthenticator.getUserName().encode('ascii')
- password = xAuthenticator.getPassword().encode('ascii')
- if user != b'':
+ user = xAuthenticator.getUserName()
+ password = xAuthenticator.getPassword()
+ if user != '':
+ if sys.version '3': # fdo#59249 i#105669 Python 2
needs ascii
+ user = user.encode('ascii')
+ password = password.encode('ascii')
if dbg:
print(Logging in, username of + user,
file=dbgout)
self.server.login(user, password)
@@ -348,8 +354,11 @@ class PyMailPOP3Service(unohelper.Base, XMailService):
self.server = poplib.POP3(server, port)
print(AFTER, file=dbgout)
- user = xAuthenticator.getUserName().encode('ascii')
- password = xAuthenticator.getPassword().encode('ascii')
+ user = xAuthenticator.getUserName()
+ password = xAuthenticator.getPassword()
+ if sys.version '3': # fdo#59249 i#105669 Python 2 needs
ascii
+ user = user.encode('ascii')
+ password = password.encode('ascii')
if dbg:
print(Logging in, username of + user, file=dbgout)
self.server.user(user)
commit b08dc0bf48cef97e90ae1f4633591add680b
Author: Michael Stahl mst...@redhat.com
Date: Mon Jan 14 12:22:31 2013 +0100
Revert fdo#59249: mailmerge.py: some more bytes vs. str mangling
This reverts commit 9dec0c79011a0c09068d86fba9387c67da84a39b.
Was nonsense because login method actually expects str arguments.
diff --git a/scripting/source/pyprov/mailmerge.py
b/scripting/source/pyprov/mailmerge.py
index cfbe761..9dce4d3 100755
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -103,7 +103,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
password = xAuthenticator.getPassword().encode('ascii')
if user != b'':
if dbg:
- print(Logging in, username of +
user.decode('ascii'), file=dbgout)
+ print(Logging in, username of, user,
file=dbgout)
self.server.login(user, password)
for listener in self.listeners:
@@ -137,7 +137,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
bccrecipients = xMailMessage.getBccRecipients()
if dbg:
print(PyMailSMTPService subject + subject,
file=dbgout)
- print(PyMailSMTPService from + sendername,
file=dbgout)
+ print(PyMailSMTPService from +
sendername.encode('utf-8'), file=dbgout)
print(PyMailSMTPService from + sendermail,
[PUSHED] append library specific compile flags at the end
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1632 Approvals: Noel Power: Verified; Looks good to me, approved Norbert Thiebaud: Verified -- To view, visit https://gerrit.libreoffice.org/1632 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If9d4640b59dd411734a581c66f9310d31ab9fbb7 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Noel Power noel.po...@suse.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: fdo#59249: mailmerge.py: adapt to changes in smtplib:
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1669
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/69/1669/1
fdo#59249: mailmerge.py: adapt to changes in smtplib:
Apparently the login() method in Python 3.3 expects str arguments for
user and password, since it calls encode on them, but for Python 2.6 the
encode calls were explicitly added in the caller since login() does
not encode itself; add an ugly version check for that.
Change-Id: Iebfce44073a837e9cb845855ba448d5b6a2ebd11
(cherry picked from commit 1a5b3d8e4d88aa27647cc7b99623dd6f6e706bbc)
---
M scripting/source/pyprov/mailmerge.py
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/scripting/source/pyprov/mailmerge.py
b/scripting/source/pyprov/mailmerge.py
index d76322e..c606143 100755
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -99,9 +99,12 @@
self.server.starttls()
self.server.ehlo()
- user = xAuthenticator.getUserName().encode('ascii')
- password = xAuthenticator.getPassword().encode('ascii')
- if user != b'':
+ user = xAuthenticator.getUserName()
+ password = xAuthenticator.getPassword()
+ if user != '':
+ if sys.version '3': # fdo#59249 i#105669 Python 2
needs ascii
+ user = user.encode('ascii')
+ password = password.encode('ascii')
if dbg:
print(Logging in, username of + user,
file=dbgout)
self.server.login(user, password)
@@ -279,9 +282,12 @@
self.server = imaplib.IMAP4(server, port)
print(AFTER, file=dbgout)
- user = xAuthenticator.getUserName().encode('ascii')
- password = xAuthenticator.getPassword().encode('ascii')
- if user != b'':
+ user = xAuthenticator.getUserName()
+ password = xAuthenticator.getPassword()
+ if user != '':
+ if sys.version '3': # fdo#59249 i#105669 Python 2
needs ascii
+ user = user.encode('ascii')
+ password = password.encode('ascii')
if dbg:
print(Logging in, username of + user,
file=dbgout)
self.server.login(user, password)
@@ -348,8 +354,11 @@
self.server = poplib.POP3(server, port)
print(AFTER, file=dbgout)
- user = xAuthenticator.getUserName().encode('ascii')
- password = xAuthenticator.getPassword().encode('ascii')
+ user = xAuthenticator.getUserName()
+ password = xAuthenticator.getPassword()
+ if sys.version '3': # fdo#59249 i#105669 Python 2 needs
ascii
+ user = user.encode('ascii')
+ password = password.encode('ascii')
if dbg:
print(Logging in, username of + user, file=dbgout)
self.server.user(user)
--
To view, visit https://gerrit.libreoffice.org/1669
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebfce44073a837e9cb845855ba448d5b6a2ebd11
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl mst...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 31 ---
1 file changed, 28 insertions(+), 3 deletions(-)
New commits:
commit 18be0ce63bbff4132c198e29a34cf3e5a27369d5
Author: Eilidh McAdam eil...@lanedo.com
Date: Fri Jan 11 18:16:45 2013 +0100
Fixes image drop shadow export to DOCX.
Word has problems if the effect extent element is omitted. This gets
the minimum required extent using the shadow position.
Change-Id: I69d0d7a694c34f50289253e5cb7c4265198deaa8
Reviewed-on: https://gerrit.libreoffice.org/1655
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index b97b368..2669b5f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2141,9 +2141,35 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode* pGrfNode, const Size
XML_cx, aWidth.getStr(),
XML_cy, aHeight.getStr(),
FSEND );
-// TODO - the right effectExtent, extent including the effect
+
+// effectExtent, extent including the effect (shadow only for now)
+SvxShadowItem aShadowItem = pFrmFmt-GetShadow();
+OString aLeftExt(0), aRightExt(0), aTopExt(0), aBottomExt(0);
+if ( aShadowItem.GetLocation() != SVX_SHADOW_NONE )
+{
+OString aShadowWidth( OString::valueOf( TwipsToEMU(
aShadowItem.GetWidth() ) ) );
+switch ( aShadowItem.GetLocation() )
+{
+case SVX_SHADOW_TOPLEFT:
+aTopExt = aLeftExt = aShadowWidth;
+break;
+case SVX_SHADOW_TOPRIGHT:
+aTopExt = aRightExt = aShadowWidth;
+break;
+case SVX_SHADOW_BOTTOMLEFT:
+aBottomExt = aLeftExt = aShadowWidth;
+break;
+case SVX_SHADOW_BOTTOMRIGHT:
+aBottomExt = aRightExt = aShadowWidth;
+break;
+case SVX_SHADOW_NONE:
+case SVX_SHADOW_END:
+break;
+}
+}
+
m_pSerializer-singleElementNS( XML_wp, XML_effectExtent,
-XML_l, 0, XML_t, 0, XML_r, 0, XML_b, 0,
+XML_l, aLeftExt, XML_t, aTopExt, XML_r, aRightExt, XML_b,
aBottomExt,
FSEND );
if( isAnchor )
@@ -2275,7 +2301,6 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode* pGrfNode, const Size
m_pSerializer-endElementNS( XML_a, XML_ln );
// Output effects
-SvxShadowItem aShadowItem = pFrmFmt-GetShadow();
if ( aShadowItem.GetLocation() != SVX_SHADOW_NONE )
{
// Distance is measured diagonally from corner
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Fixes image drop shadow export to DOCX.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1655 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1655 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I69d0d7a694c34f50289253e5cb7c4265198deaa8 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Eilidh McAdam eilidh.mca...@gmail.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - formula/inc formula/source sc/inc sc/qa sc/source sc/util
formula/inc/formula/compiler.hrc | 42 ++--- formula/inc/formula/errorcodes.hxx |3 formula/inc/formula/opcode.hxx |2 formula/source/core/api/FormulaCompiler.cxx| 79 +++-- formula/source/core/api/token.cxx | 22 +- formula/source/core/resource/core_resource.src | 12 + sc/inc/helpids.h |2 sc/qa/unit/ucalc.cxx | 76 + sc/source/core/inc/interpre.hxx|1 sc/source/core/tool/interpr1.cxx | 198 +++-- sc/source/core/tool/interpr4.cxx | 13 + sc/source/core/tool/parclass.cxx |4 sc/source/core/tool/token.cxx |5 sc/source/filter/excel/xlformula.cxx | 13 + sc/source/filter/oox/formulabase.cxx | 11 + sc/source/ui/src/scfuncs.src | 64 sc/util/hidother.src |2 17 files changed, 485 insertions(+), 64 deletions(-) New commits: commit 6ce6ddcc57b3ef7c643523e26b6caa69f5530178 Author: Eike Rathke er...@redhat.com Date: Sat Jan 12 17:48:59 2013 +0100 fdo#56124 add functions IFERROR and IFNA to calc as in ODFF1.2 Change-Id: Ic282e1510e121be8fe52320f1f0fe0acc4b9a652 diff --git a/formula/inc/formula/compiler.hrc b/formula/inc/formula/compiler.hrc index 582e3a5..7f976ae 100644 --- a/formula/inc/formula/compiler.hrc +++ b/formula/inc/formula/compiler.hrc @@ -29,26 +29,28 @@ #define SC_OPCODE_NAME4 #define SC_OPCODE_EXTERNAL_REF5 #define SC_OPCODE_IF 6 /* jump commands */ -#define SC_OPCODE_CHOSE 7 -#define SC_OPCODE_OPEN8 /* parentheses and separators */ -#define SC_OPCODE_CLOSE 9 -#define SC_OPCODE_SEP10 -#define SC_OPCODE_MISSING11 /* special OpCodes */ -#define SC_OPCODE_BAD12 -#define SC_OPCODE_STRINGXML 13 -#define SC_OPCODE_SPACES 14 -#define SC_OPCODE_MAT_REF15 -#define SC_OPCODE_DB_AREA16 /* additional access operators */ -#define SC_OPCODE_MACRO 17 -#define SC_OPCODE_COL_ROW_NAME 18 -#define SC_OPCODE_COL_ROW_NAME_AUTO 19 -#define SC_OPCODE_PERCENT_SIGN 20 /* operator _follows_ value */ -#define SC_OPCODE_ARRAY_OPEN 21 -#define SC_OPCODE_ARRAY_CLOSE22 -#define SC_OPCODE_ARRAY_ROW_SEP 23 -#define SC_OPCODE_ARRAY_COL_SEP 24 /* some convs use sep != col_sep */ -#define SC_OPCODE_STOP_DIV 25 -#define SC_OPCODE_SKIP 26 /* used to skip raw tokens during string compilation */ +#define SC_OPCODE_IF_ERROR7 +#define SC_OPCODE_IF_NA 8 +#define SC_OPCODE_CHOSE 9 +#define SC_OPCODE_OPEN 10 /* parentheses and separators */ +#define SC_OPCODE_CLOSE 11 +#define SC_OPCODE_SEP12 +#define SC_OPCODE_MISSING13 /* special OpCodes */ +#define SC_OPCODE_BAD14 +#define SC_OPCODE_STRINGXML 15 +#define SC_OPCODE_SPACES 16 +#define SC_OPCODE_MAT_REF17 +#define SC_OPCODE_DB_AREA18 /* additional access operators */ +#define SC_OPCODE_MACRO 19 +#define SC_OPCODE_COL_ROW_NAME 20 +#define SC_OPCODE_COL_ROW_NAME_AUTO 21 +#define SC_OPCODE_PERCENT_SIGN 22 /* operator _follows_ value */ +#define SC_OPCODE_ARRAY_OPEN 23 +#define SC_OPCODE_ARRAY_CLOSE24 +#define SC_OPCODE_ARRAY_ROW_SEP 25 +#define SC_OPCODE_ARRAY_COL_SEP 26 /* some convs use sep != col_sep */ +#define SC_OPCODE_STOP_DIV 27 +#define SC_OPCODE_SKIP 28 /* used to skip raw tokens during string compilation */ /*** error constants #... ***/ #define SC_OPCODE_START_ERRORS 30 diff --git a/formula/inc/formula/errorcodes.hxx b/formula/inc/formula/errorcodes.hxx index a99dc7b..1e145e0 100644 --- a/formula/inc/formula/errorcodes.hxx +++ b/formula/inc/formula/errorcodes.hxx @@ -72,6 +72,9 @@ const sal_uInt16 errNestedArray = 533; // be used to distinguish that condition from all other (inherited) errors. Do // not use for anything else! Never push or inherit the error otherwise! const sal_uInt16 errNotNumericString = 534; +// ScInterpreter internal: jump matrix already has a result at this position, +// do not overwrite in case of empty code path. +const sal_uInt16 errJumpMatHasResult = 535; // Interpreter: NA() not available condition, not a real error const sal_uInt16 NOTAVAILABLE= 0x7fff; diff --git a/formula/inc/formula/opcode.hxx b/formula/inc/formula/opcode.hxx index cd1831b..e37395e 100644 --- a/formula/inc/formula/opcode.hxx +++ b/formula/inc/formula/opcode.hxx @@ -34,6 +34,8 @@ enum OpCodeEnum ocExternalRef = SC_OPCODE_EXTERNAL_REF,
Re: REVIEW [4-0-0] [PUSHED 4.0 ] Late Feature: IFERROR and IFNA spreadsheet functions
On 12/01/13 18:13, Eike Rathke wrote: Hi, The attached patch implements the much requested IFERROR and IFNA spreadsheet functions on the 4-0 branch. I would like to have them as late feature in 4-0-0 if possible though string freeze was announced already, so 3 reviews would be needed. At least 4-0 should have it for 4-1-0 Thanks Eike pushed to 4.0, further reviews needed for 4-0-0 Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
strange behaviour of SwCrsrShell::aVisArea
Hi all, I'm trying to enhance the patch for fdo#40465 as the patch results in behaviour that in some cases is a regression. When zooming I want to know if the cursor is visible. The function SwCrsrShell::CrsrIsVisible() some times returns sal_False when the cursor absolutely is visible in the view. I collected some traces of the cursor position and of the visible area (SwCrsrShell::aVisArea) and to my amazement the area differs between two (visually) identical views. I opened a writer document with 22 pages, scrolled to page 16, with cursor at page 16. SwCrsrShell::CrsrIsVisible() returns sal_True, zoom % is 60, SwCrsrShell::aVisArea.Top(), Bottom() give 170460 and 188635. I then move the cursor one line down and back (no scrolling), zoom to 55% and back to 60%. The visible area looks identical, the cursor is back in the same location. Now SwCrsrShell::CrsrIsVisible() returns sal_True, zoom % is 60, SwCrsrShell::aVisArea.Top(), Bottom() give 115860 and 134035. The cursor rectangle position has not changed and now is not in SwCrsrShell::aVisArea (cursor top/bottom is 121272/122191). What is the explanation for this behaviour? If this is 'normal', how can I (jn the code) find out if the cursor is visible? If required, I can upload the document as well as the code for the trace into bug fdo#40465. Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/text/TextDocument.py |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit 155600869800a0b51f9787b8a1879d3c680342c3 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Jan 14 14:03:40 2013 +0100 fdo#59248: Remove remaining dangling view of ViewHandler.py ...that had been left behind by d6308705133ccde121dcd40f94a1d4367356630b pywizards: get rid of ViewHandler and caused from .LetterWizardDialogImpl import LetterWizardDialogImpl in CallWizard.py to fail. Change-Id: I51dcb2812863f502bc06e3e3b07285f6c31714ca diff --git a/wizards/com/sun/star/wizards/text/TextDocument.py b/wizards/com/sun/star/wizards/text/TextDocument.py index 150b0bf..5502978 100644 --- a/wizards/com/sun/star/wizards/text/TextDocument.py +++ b/wizards/com/sun/star/wizards/text/TextDocument.py @@ -19,7 +19,6 @@ import uno import traceback import time from datetime import date as dateTimeObject -from .ViewHandler import ViewHandler from .TextFieldHandler import TextFieldHandler from ..document.OfficeDocument import OfficeDocument from ..common.Desktop import Desktop @@ -142,10 +141,8 @@ class TextDocument(object): self.DocSize = self.getPageSize() -myViewHandler = ViewHandler(self.xTextDocument, self.xTextDocument) try: -myViewHandler.setViewSetting( -ZoomType, ENTIRE_PAGE) +self.xTextDocument.CurrentController.ViewSettings.ZoomType = ENTIRE_PAGE except Exception: traceback.print_exc() myFieldHandler = TextFieldHandler(self.xMSF, self.xTextDocument) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: replacing OUString::valueOf(static_castsal_Int32) ??
On 2013-01-11 15:32, Lubos Lunak wrote: Following this, what the developer really wants is to create a string from a number. So OUString::fromNumber() seems like the obvious name for it. And it should take numbers of any kind, as it doesn't really matter, in the common case give me this number as a string is conceptually the same whether the number is a long or float. So that should be the optimal API for the functionality. Now some real-world issues may enter into play, e.g. when the number is integer, it may be useful to specify the radix, which doesn't make much sense with floats; valueOf() has a default argument there, so it can be handled the same way. Another thing, since valueOf() is often used when constructing strings, OUString::fromNumber() may be considered a bit too long and it may be acceptable trade-off to shorten it to OUString::number(). Anything less, such as leaking irrelevant implementation details and forcing the developer to explicitly specify the underlying type, is settling on sub-optimal API that moves part of the implementation burden on the user of the library. So, based on this, the best solution to the problem that I can see is creating fromNumber() or number() , overloaded for all signed/unsigned int/long/long long types and all floats because of the lame language ambiguity. The original valueOf() can be wrapped inside #ifndef LIBO_INTERNAL_ONLY after LO is moved away from this problematic function to keep it only for external backwards compatibility, while LO itself will no longer have it. So rather than bitting us in small ways every now and then, the (possibly smaller in the end, if it wasn't for this discussion) effort is spent now, and the effort is not that big (all the duplicates can be only 6 lines, 2 for doxygen @overload @since, 4 for code forwarding to the overload taking the largest type). Win/win. And if this is still not convincing enough, then I give up. OK, so I tried modifying my patch so that we have number(sal_Int64) number(float) number(double) At which point my unit tests fail when passing a 32-bit value in because the compiler does not know which overload to use - this is on 64-bit Ubuntu using gcc 4.7.2 I can't add a sal_Int32 variant because I suspect that will make the original problem come back, which was where we started, with all the static_castsal_Int32 stuff. Any ideas? Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sfx2/source
sfx2/source/doc/objstor.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 3495f4817b80c3fc9846ed2bddfc492d39f01679
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Jan 14 14:11:53 2013 +0100
Work around may be used uninitialized warnings
Change-Id: Ib31ebaf6a6117689737705921a7af558257e8cd1
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index d646e5f..059bf5b 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2873,8 +2873,8 @@ sal_uInt16 SfxObjectShell::GetHiddenInformationState(
sal_uInt16 nStates )
sal_Int16 SfxObjectShell::QueryHiddenInformation( HiddenWarningFact eFact,
Window* pParent )
{
sal_Int16 nRet = RET_YES;
-sal_uInt16 nResId = 0;
-SvtSecurityOptions::EOption eOption;
+sal_uInt16 nResId = sal_uInt16();
+SvtSecurityOptions::EOption eOption = SvtSecurityOptions::EOption();
switch ( eFact )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: REVIEW [4-0-0] [PUSHED 4.0 ] Late Feature: IFERROR and IFNA spreadsheet functions
Hi Noel, On Monday, 2013-01-14 12:49:42 +, Noel Power wrote: The attached patch implements the much requested IFERROR and IFNA spreadsheet functions on the 4-0 branch. I would like to have them as late feature in 4-0-0 if possible though string freeze was announced already, so 3 reviews would be needed. At least 4-0 should have it for 4-1-0 ^ I meant to write 4-0-1 there.. pushed to 4.0, further reviews needed for 4-0-0 Well, thanks, but, hum.. We don't have a 4-0-0 branch yet, so being on 4-0 now means it will land in 4.0.0 anyhow ... maybe we should at least have the late feature consense in hindsight? Otherwise we'd have to revert the commit until 4-0-0 will be branched off. Or did I get something wrong? Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. New GnuPG key 0x65632D3A : 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Old GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpk3NF3rq9ZF.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit a6f5e5238ca4536eff6c52cf10e52bd116723d72 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Jan 14 14:27:58 2013 +0100 Fix one more use of removed ViewHandler.py ...in the style of d6308705133ccde121dcd40f94a1d4367356630b pywizards: get rid of ViewHandler and 155600869800a0b51f9787b8a1879d3c680342c3 fdo#59248: Remove remaining dangling view of ViewHandler.py, though the Python version of the Agenda wizard appers not be used yet, anyway. Change-Id: I993306d6ffa87d0938763706d41e12b2ffdf57e6 diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py index 2dbcea7..bf6b777 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py +++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py @@ -31,7 +31,6 @@ from ..common.Desktop import Desktop from ..common.HelpIds import HelpIds from ..common.Configuration import Configuration from ..document.OfficeDocument import OfficeDocument -from ..text.ViewHandler import ViewHandler from com.sun.star.view.DocumentZoomType import OPTIMAL from com.sun.star.awt.VclWindowPeerAttribute import YES_NO, DEF_NO @@ -384,8 +383,7 @@ class AgendaWizardDialogImpl(AgendaWizardDialog): oDoc = OfficeDocument.load( Desktop.getDesktop(self.xMSF), self.sPath, _default, loadValues) -myViewHandler = ViewHandler(self.xMSF, oDoc) -myViewHandler.setViewSetting(ZoomType, OPTIMAL) +oDoc.CurrentController.ViewSettings.ZoomType = OPTIMAL else: pass ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/crsr/pam.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 50b6dc0099ff61050b82a2e37e70d643151e7ce7
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Jan 14 10:55:55 2013 +0100
fdo#57938 SwPaM::HasReadonlySel allow editing before commented text ranges
Change-Id: I229602e7783c76e7fc57b78a408f90c1f6a8cda5
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 852..5fbf4bc 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -700,6 +700,13 @@ sal_Bool SwPaM::HasReadonlySel( bool bFormView ) const
if (!bUnhandledMark)
bCommentrangeMark = pFieldmark-GetFieldname() ==
ODF_COMMENTRANGE;
}
+// Allow editing selection right before a commented range.
+if (!bCommentrangeMark GetMark())
+{
+pFieldmark = pMarksAccess-getFieldmarkFor(*GetMark());
+if (pFieldmark)
+bCommentrangeMark = pFieldmark-GetFieldname() ==
ODF_COMMENTRANGE;
+}
}
if (!bRet)
@@ -708,7 +715,7 @@ sal_Bool SwPaM::HasReadonlySel( bool bFormView ) const
if ( ( pA == pB ) bUnhandledMark )
bRet = sal_True;
// Allow editing of commented ranges.
-else if (!((pA == pB) bCommentrangeMark))
+else if (!bCommentrangeMark)
{
// Form protection case
bool bAtStartA = pA != NULL pA-GetMarkStart() == *GetPoint();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b1859c3a6d32dff66550c33831df241035d91aa9
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Mon Jan 14 14:49:01 2013 +0100
docx export: add missing arg to impl_pageBorders call
The missing argument could cause data loss due to ill-formatted
document produced.
Change-Id: I65dee7f42c633ae9602d454e2f03ebc821c9c0ab
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 2669b5f..273287b 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4474,7 +4474,7 @@ void DocxAttributeOutput::FormatBox( const SvxBoxItem
rBox )
m_pSerializer-startElementNS( XML_w, XML_pBdr, FSEND );
}
-impl_pageBorders( m_pSerializer, rBox, false, false );
+impl_pageBorders( m_pSerializer, rBox, XML_pBdr, false, false );
if ( m_bOpenedSectPr )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change in core[libreoffice-4-0]: fdo#59248: Remove remaining dangling view of ViewHandler.py
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1670 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/70/1670/1 fdo#59248: Remove remaining dangling view of ViewHandler.py ...that had been left behind by d6308705133ccde121dcd40f94a1d4367356630b pywizards: get rid of ViewHandler and caused from .LetterWizardDialogImpl import LetterWizardDialogImpl in CallWizard.py to fail. Change-Id: I51dcb2812863f502bc06e3e3b07285f6c31714ca (cherry picked from commit 155600869800a0b51f9787b8a1879d3c680342c3) --- M wizards/com/sun/star/wizards/text/TextDocument.py 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/wizards/com/sun/star/wizards/text/TextDocument.py b/wizards/com/sun/star/wizards/text/TextDocument.py index 150b0bf..5502978 100644 --- a/wizards/com/sun/star/wizards/text/TextDocument.py +++ b/wizards/com/sun/star/wizards/text/TextDocument.py @@ -19,7 +19,6 @@ import traceback import time from datetime import date as dateTimeObject -from .ViewHandler import ViewHandler from .TextFieldHandler import TextFieldHandler from ..document.OfficeDocument import OfficeDocument from ..common.Desktop import Desktop @@ -142,10 +141,8 @@ self.DocSize = self.getPageSize() -myViewHandler = ViewHandler(self.xTextDocument, self.xTextDocument) try: -myViewHandler.setViewSetting( -ZoomType, ENTIRE_PAGE) +self.xTextDocument.CurrentController.ViewSettings.ZoomType = ENTIRE_PAGE except Exception: traceback.print_exc() myFieldHandler = TextFieldHandler(self.xMSF, self.xTextDocument) -- To view, visit https://gerrit.libreoffice.org/1670 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I51dcb2812863f502bc06e3e3b07285f6c31714ca Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - ucb/source
ucb/source/ucp/file/bc.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit af46de550494aed4cfaf1a0dde4c0d170d66b03f
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Jan 13 15:52:23 2013 +0100
Add missing parenthesis
Like this since 29/06/2001 (5ef2de612d973bc747ff4a107e4e4c4ecb273429)
Change-Id: Ic86d6ca473a8bdf8f4c6f216fb6dd20af4694911
(cherry picked from commit a2dd3feaea16a765956aecacdd6cc21ab5404a5b)
Signed-off-by: Eike Rathke er...@redhat.com
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index eba4595..8ea4a92 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -1181,7 +1181,7 @@ void SAL_CALL BaseContent::insert( sal_Int32
nMyCommandIdentifier,
// Inserts the content, which has the flag m_bIsFresh
-if( ! m_nState NameForInsertionSet )
+if( ! (m_nState NameForInsertionSet) )
{
m_pMyShell-installError( nMyCommandIdentifier,
TASKHANDLING_NONAMESET_INSERT_COMMAND );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - ucb/source
ucb/source/ucp/file/bc.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 12dd56b7aac28aa29ba0d89c008f3b87b63aa739
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Jan 13 15:52:23 2013 +0100
Add missing parenthesis
Like this since 29/06/2001 (5ef2de612d973bc747ff4a107e4e4c4ecb273429)
Change-Id: Ic86d6ca473a8bdf8f4c6f216fb6dd20af4694911
(cherry picked from commit a2dd3feaea16a765956aecacdd6cc21ab5404a5b)
Signed-off-by: Eike Rathke er...@redhat.com
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index f6063cc..a08e033 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -1172,7 +1172,7 @@ void SAL_CALL BaseContent::insert( sal_Int32
nMyCommandIdentifier,
// Inserts the content, which has the flag m_bIsFresh
-if( ! m_nState NameForInsertionSet )
+if( ! (m_nState NameForInsertionSet) )
{
m_pMyShell-installError( nMyCommandIdentifier,
TASKHANDLING_NONAMESET_INSERT_COMMAND );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: REVIEW [4-0-0] [PUSHED 4.0 ] Late Feature: IFERROR and IFNA spreadsheet functions
On 14/01/13 13:16, Eike Rathke wrote: Hi Noel, On Monday, 2013-01-14 12:49:42 +, Noel Power wrote: [...] ^ I meant to write 4-0-1 there.. somehow I read it as that pushed to 4.0, further reviews needed for 4-0-0 Well, thanks, but, hum.. We don't have a 4-0-0 branch yet, so being on 4-0 now means it will land in 4.0.0 anyhow ... gah you are right ( seems I am too used to 3.6 ) maybe we should at least have the late feature consense in hindsight? yes, Petr, Kendy what's the chances for this, should we wait a day or 2 or just revert now sorry about that :-) Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Stepping back from The Document Foundation
Hi Florian, On Sunday, 2013-01-13 16:54:52 +0100, Florian Monfort wrote: I've decided recently that I would stop watching Document Foundation activities. Indeed I've found myself completely overloaded with work from School and Red Hat, so I cannot properly contribute. That's fine, unfortunate, but your decision and of course all up to you how you spend your time. With the rest of your mail I totally disagree, in its entirety. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. New GnuPG key 0x65632D3A : 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Old GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpUvBzdVaSMF.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: strange behaviour of SwCrsrShell::aVisArea
On Mon, 2013-01-14 at 14:01 +0100, Winfried Donkers wrote: SwCrsrShell::CrsrIsVisible() returns sal_True, zoom % is 60, SwCrsrShell::aVisArea.Top(), Bottom() give 170460 and 188635. I then move the cursor one line down and back (no scrolling), zoom to 55% and back to 60%. The visible area looks identical, the cursor is back in the same location. Now SwCrsrShell::CrsrIsVisible() returns sal_True, zoom % is 60, SwCrsrShell::aVisArea.Top(), Bottom() give 115860 and 134035. The cursor rectangle position has not changed and now is not in SwCrsrShell::aVisArea (cursor top/bottom is 121272/122191). What is the explanation for this behaviour? I don't know that area of the code too well, but this smells pretty bad. May be looking at what changes the aVisArea to these (false) values would help. -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 4-0 3-6] Missing parenthesis in ucb/source/ucp/file/bc.cxx
Hi julien2412, On Sunday, 2013-01-13 07:01:09 -0800, julien2412 wrote: http://cgit.freedesktop.org/libreoffice/core/commit/?id=a2dd3feaea16a765956aecacdd6cc21ab5404a5b, I added missing parenthesis because according to http://en.cppreference.com/w/cpp/language/operator_precedence, AND bitwise has less priority than ! Yup, thanks for that. Could someone cherry-pick this to 4.0 branch and 3.6? 4-0: 12dd56b7aac28aa29ba0d89c008f3b87b63aa739 3-6: af46de550494aed4cfaf1a0dde4c0d170d66b03f Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. New GnuPG key 0x65632D3A : 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Old GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpb6twFR89ql.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: REVIEW [4-0-0] [PUSHED 4.0 ] Late Feature: IFERROR and IFNA spreadsheet functions
On Mon, Jan 14, 2013 at 02:02:45PM +, Noel Power wrote: On 14/01/13 13:16, Eike Rathke wrote: Hi Noel, On Monday, 2013-01-14 12:49:42 +, Noel Power wrote: [...] ^ I meant to write 4-0-1 there.. somehow I read it as that pushed to 4.0, further reviews needed for 4-0-0 Well, thanks, but, hum.. We don't have a 4-0-0 branch yet, so being on 4-0 now means it will land in 4.0.0 anyhow ... gah you are right ( seems I am too used to 3.6 ) maybe we should at least have the late feature consense in hindsight? yes, Petr, Kendy what's the chances for this, should we wait a day or 2 or just revert now I'd not bother to revert unless that works. Incidentially, I would be against introduding a feature in 4.0.1, but would be OK with doing it before 4.0.0 ;-) (Especially as I already updated http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=662798 assuming the ACKs were on IRC or something... ) Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/qa
sw/qa/core/swdoc-test.cxx | 22 ++
1 file changed, 22 insertions(+)
New commits:
commit bf670bcd5e60eae95a6bd297391799f13e55db9d
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Jan 14 15:23:49 2013 +0100
fdo#57938 testcase
Change-Id: I5a219011952f37861b0688e17afca1b3b07fdc31
diff --git a/sw/qa/core/swdoc-test.cxx b/sw/qa/core/swdoc-test.cxx
index de9828e..f2cc9cc 100644
--- a/sw/qa/core/swdoc-test.cxx
+++ b/sw/qa/core/swdoc-test.cxx
@@ -45,6 +45,8 @@
#include sfx2/docfile.hxx
#include sfx2/sfxmodelfactory.hxx
+#include xmloff/odffields.hxx
+
#include breakit.hxx
#include doc.hxx
#include docsh.hxx
@@ -88,6 +90,7 @@ public:
void testSwScanner();
void testUserPerceivedCharCount();
void testGraphicAnchorDeletion();
+void testFdo57938();
CPPUNIT_TEST_SUITE(SwDocTest);
CPPUNIT_TEST(randomTest);
@@ -98,6 +101,7 @@ public:
CPPUNIT_TEST(testSwScanner);
CPPUNIT_TEST(testUserPerceivedCharCount);
CPPUNIT_TEST(testGraphicAnchorDeletion);
+CPPUNIT_TEST(testFdo57938);
CPPUNIT_TEST_SUITE_END();
private:
@@ -874,6 +878,24 @@ void SwDocTest::randomTest()
}
}
+void SwDocTest::testFdo57938()
+{
+SwNodeIndex aIdx(m_pDoc-GetNodes().GetEndOfContent(), -1);
+SwPaM aPaM(aIdx);
+
+// Insert atest and create a fieldmark around test.
+OUString aTest(atest);
+m_pDoc-InsertString(aPaM, aTest);
+aPaM.SetMark();
+aPaM.GetPoint()-nContent = 1;
+IDocumentMarkAccess* pMarksAccess = m_pDoc-getIDocumentMarkAccess();
+pMarksAccess-makeFieldBookmark(aPaM, , ODF_COMMENTRANGE);
+aPaM.GetPoint()-nContent = 0;
+aPaM.GetMark()-nContent = 1;
+// The problem was that a was considered read-only, so could not be
deleted.
+CPPUNIT_ASSERT_EQUAL(false, bool(aPaM.HasReadonlySel(false)));
+}
+
void SwDocTest::setUp()
{
BootstrapFixture::setUp();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sw/inc sw/qa sw/source
sw/inc/pam.hxx |3 ++-
sw/qa/core/swdoc-test.cxx |2 +-
sw/source/core/crsr/pam.cxx |4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit e85b4e8531125c5b437db515981a344138b8fdd5
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Jan 14 15:54:05 2013 +0100
document SwPaM::SetMark()
Change-Id: I2a57cdea7e952c52f5ee93466a7b81da73b75a7c
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 9c0f04b..384fbb9 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -208,6 +208,7 @@ public:
inline bool IsInFrontOfLabel() const{ return m_bIsInFrontOfLabel; }
inline void _SetInFrontOfLabel( bool bNew ) { m_bIsInFrontOfLabel = bNew; }
+/// Unless this is called, the getter method of Mark will return Point.
virtual void SetMark();
void DeleteMark()
commit 55b7d15ae984d4ff772e147414c775d2ad69c9f0
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Jan 14 15:52:58 2013 +0100
SwPaM::HasReadonlySel: sal_Bool - bool
Change-Id: If4c9cb523c6ac357683522029769a82ba10667f1
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 31e1008..9c0f04b 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -288,7 +288,7 @@ public:
/** Is in something protected (readonly) or selection contains
something protected. */
-sal_Bool HasReadonlySel( bool bFormView ) const;
+bool HasReadonlySel( bool bFormView ) const;
sal_Bool ContainsPosition(const SwPosition rPos)
{ return *Start() = rPos rPos = *End(); }
diff --git a/sw/qa/core/swdoc-test.cxx b/sw/qa/core/swdoc-test.cxx
index f2cc9cc..189a25c 100644
--- a/sw/qa/core/swdoc-test.cxx
+++ b/sw/qa/core/swdoc-test.cxx
@@ -893,7 +893,7 @@ void SwDocTest::testFdo57938()
aPaM.GetPoint()-nContent = 0;
aPaM.GetMark()-nContent = 1;
// The problem was that a was considered read-only, so could not be
deleted.
-CPPUNIT_ASSERT_EQUAL(false, bool(aPaM.HasReadonlySel(false)));
+CPPUNIT_ASSERT_EQUAL(false, aPaM.HasReadonlySel(false));
}
void SwDocTest::setUp()
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 5fbf4bc..505477a 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -590,9 +590,9 @@ static const SwFrm* lcl_FindEditInReadonlyFrm( const SwFrm
rFrm )
}
/// is in protected section or selection surrounds something protected
-sal_Bool SwPaM::HasReadonlySel( bool bFormView ) const
+bool SwPaM::HasReadonlySel( bool bFormView ) const
{
-sal_Bool bRet = sal_False;
+bool bRet = sal_False;
Point aTmpPt;
const SwCntntNode *pNd;
const SwCntntFrm *pFrm;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#56098 Paste Special options after cut incorrect
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1671
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/1671/1
fdo#56098 Paste Special options after cut incorrect
Change-Id: Icf6aa698e69a2271cf68f420ceaec4aaffe94ad0
---
M sc/source/ui/view/cellsh1.cxx
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 6d434ce..82f969c 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1271,18 +1271,15 @@
{
SCCOL nPosX = pData-GetCurX();
SCROW nPosY = pData-GetCurY();
-SCCOL nClipStartX, nClipSizeX;
-SCROW nClipStartY, nClipSizeY;
-pOwnClip-GetDocument()-GetClipStart(
nClipStartX, nClipStartY );
+SCCOL nClipSizeX;
+SCROW nClipSizeY;
// for CutMode, filtered rows can
always be included
pOwnClip-GetDocument()-GetClipArea(
nClipSizeX, nClipSizeY, sal_True );
int nDisableShift = 0;
-if ( nClipStartX = nPosX + nClipSizeX
-nPosX = nClipStartX +
nClipSizeX )
+if ( nPosX + 2 * nClipSizeX + 1
MAXCOL ) // fdo#56098
+ nDisableShift |=
SC_CELL_SHIFT_DISABLE_RIGHT;
+if ( nPosY + 2 * nClipSizeY + 1
MAXROW ) // fdo#56098
nDisableShift |=
SC_CELL_SHIFT_DISABLE_DOWN;
-if ( nClipStartY = nPosY + nClipSizeY
-nPosY = nClipStartY +
nClipSizeY )
-nDisableShift |=
SC_CELL_SHIFT_DISABLE_RIGHT;
if ( nDisableShift )
pDlg-SetCellShiftDisabled(
nDisableShift );
}
--
To view, visit https://gerrit.libreoffice.org/1671
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf6aa698e69a2271cf68f420ceaec4aaffe94ad0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Winfried Donkers o...@dci-electronics.nl
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
fdo#56098 Paste Special options after cut incorrect
Winfried Donkers has abandoned this change. Change subject: fdo#56098 Paste Special options after cut incorrect .. Patch Set 1: Abandoned Patch has been submitted again under gerrit #1671, this time without submodule noise. -- To view, visit https://gerrit.libreoffice.org/1475 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ib196cf88905de8f8e7488c14964dfd7a56236356 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Winfried Donkers o...@dci-electronics.nl Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Winfried Donkers o...@dci-electronics.nl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: docx export: add missing arg to impl_pageBorders call
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1672
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/72/1672/1
docx export: add missing arg to impl_pageBorders call
The missing argument could cause data loss due to ill-formatted
document produced.
Change-Id: I65dee7f42c633ae9602d454e2f03ebc821c9c0ab
---
M sw/source/filter/ww8/docxattributeoutput.cxx
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 3cdc325..475645b 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4419,7 +4419,7 @@
m_pSerializer-startElementNS( XML_w, XML_pBdr, FSEND );
}
-impl_pageBorders( m_pSerializer, rBox, false, false );
+impl_pageBorders( m_pSerializer, rBox, XML_pBdr, false, false );
if ( m_bOpenedSectPr )
{
--
To view, visit https://gerrit.libreoffice.org/1672
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65dee7f42c633ae9602d454e2f03ebc821c9c0ab
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/wrtww8.cxx |4 +---
sw/source/filter/ww8/ww8atr.cxx | 11 ++-
2 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit ee9f23bb94b4c2c8c4db6466ecca272a092e9492
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Thu Jan 10 18:45:42 2013 +0100
docx export: invalid sectPr added at the beginning of the doc
This reverts commit 60fa5057039d2413d56813df4d45e5cfdfbb40ac,
which was a revert of 723f772d (fix for ooo#106749) with an
alternative fix to avoid a regression (fdo#56513).
This commit contain a fix for the sectPr issue, and does not
regress on the 2 previously fixed issue.
Change-Id: Ibc551b38d25554c59b7c4ac5a447a0d60323f53f
Reviewed-on: https://gerrit.libreoffice.org/1647
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index b89a143..01d61c5 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2368,9 +2368,7 @@ void MSWordExportBase::WriteText()
}
else if ( pNd-IsTableNode() )
{
-SwTable * pTable = pNd-GetTableNode()-GetTable();
-OutputSectionBreaks( pTable-GetTableFmt()-GetAttrSet(), *pNd );
-mpTableInfo-processSwTable( pTable );
+mpTableInfo-processSwTable( pNd-GetTableNode()-GetTable() );
}
else if ( pNd-IsSectionNode() TXT_MAINTEXT == nTxtTyp )
OutputSectionNode( *pNd-GetSectionNode() );
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index d6cbdaa..393a685 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -403,6 +403,15 @@ void MSWordExportBase::OutputSectionBreaks( const
SfxItemSet *pSet, const SwNode
//section.
bool bBreakSet = false;
+const SwPageDesc * pPageDesc = rNd.FindPageDesc(sal_False);
+
+if (pAktPageDesc != pPageDesc)
+{
+bBreakSet = true;
+bNewPageDesc = true;
+pAktPageDesc = pPageDesc;
+}
+
if ( pSet pSet-Count() )
{
if ( SFX_ITEM_SET == pSet-GetItemState( RES_PAGEDESC, false, pItem )
@@ -456,7 +465,7 @@ void MSWordExportBase::OutputSectionBreaks( const
SfxItemSet *pSet, const SwNode
if ( pBreak
pBreak-GetBreak() == SVX_BREAK_PAGE_BEFORE )
{
-bNewPageDesc = SetAktPageDescFromNode( rNd );
+bNewPageDesc |= SetAktPageDescFromNode( rNd );
}
}
if ( !bNewPageDesc )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] docx export: invalid sectPr added at the beginning of the do...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1647 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1647 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibc551b38d25554c59b7c4ac5a447a0d60323f53f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5be5a6960fb454912896284d11314fafe60b2792
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Mon Jan 14 14:49:01 2013 +0100
docx export: add missing arg to impl_pageBorders call
The missing argument could cause data loss due to ill-formatted
document produced.
Change-Id: I65dee7f42c633ae9602d454e2f03ebc821c9c0ab
Reviewed-on: https://gerrit.libreoffice.org/1672
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 3cdc325..475645b 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4419,7 +4419,7 @@ void DocxAttributeOutput::FormatBox( const SvxBoxItem
rBox )
m_pSerializer-startElementNS( XML_w, XML_pBdr, FSEND );
}
-impl_pageBorders( m_pSerializer, rBox, false, false );
+impl_pageBorders( m_pSerializer, rBox, XML_pBdr, false, false );
if ( m_bOpenedSectPr )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-4-0]: docx export: add missing arg to impl_pageBorders call
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1672 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1672 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I65dee7f42c633ae9602d454e2f03ebc821c9c0ab Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0dadee9bf62aad09e94b336b16bf93ee01d955ff Author: Andras Timar ati...@suse.com Date: Mon Jan 14 11:41:58 2013 +0100 Updated core Project: dictionaries e16148c25580961b6fd2f246eb8f8dbce07b7208 update Swedish dictionaries (2.14) Change-Id: I0f822f5bd02b166a5f45e14ac31f10f09fdc776d Reviewed-on: https://gerrit.libreoffice.org/1668 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/dictionaries b/dictionaries index 5cf7cd4..e16148c 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 5cf7cd4323ac7ff01c317951c6cb9d35f5647235 +Subproject commit e16148c25580961b6fd2f246eb8f8dbce07b7208 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 8c178a50334109b34ef456ca6aa51cd3d98699ae
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Fri Jan 11 14:38:12 2013 +0100
docx export: also export rPr in pPr (paragraph mark styling)
Change-Id: I179363e7d0acc3d6a1f95dcfe975275a9243e863
Reviewed-on: https://gerrit.libreoffice.org/1649
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 273287b..e72e924 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -442,6 +442,9 @@ void DocxAttributeOutput::EndParagraphProperties()
{
WriteCollectedParagraphProperties();
+// insert copy of rPr
+m_pSerializer-copyTopMarkPop();
+
m_pSerializer-endElementNS( XML_w, XML_pPr );
if ( m_nColBreakStatus == COLBRK_WRITE )
@@ -973,6 +976,9 @@ void DocxAttributeOutput::EndRunProperties( const
SwRedlineData* /*pRedlineData*
m_pSerializer-endElementNS( XML_w, XML_rPr );
+// Clone rPr.../rPr for later re-use, in pPr
+m_pSerializer-copyTopMarkPush();
+
// write footnotes/endnotes if we have any
FootnoteEndnoteReference();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sax/inc sax/source
sax/inc/sax/fshelper.hxx|2 ++
sax/source/tools/fastserializer.cxx | 14 ++
sax/source/tools/fastserializer.hxx |3 +++
sax/source/tools/fshelper.cxx | 10 ++
4 files changed, 29 insertions(+)
New commits:
commit 1f2c079dd2bc9a2f5aa3597a8222bde3073a04da
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Fri Jan 11 14:34:04 2013 +0100
sax: add methods to duplicate current top marker and reapply it later
The need for this is ooxml: we need to have a duplicate entry (rPr)
like this:
p
pPr
rPr.../rPr
/pPr
r
rPr.../rPR
/r
/p
This patch allows to do that by setting aside a copy of the rPr line,
and then merging the copy when needed.
Change-Id: I3868a822aa9e5210f3d814c68398a38f95072cd5
Reviewed-on: https://gerrit.libreoffice.org/1648
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sax/inc/sax/fshelper.hxx b/sax/inc/sax/fshelper.hxx
index b0b8b09..2e9d07b 100644
--- a/sax/inc/sax/fshelper.hxx
+++ b/sax/inc/sax/fshelper.hxx
@@ -142,6 +142,8 @@ public:
void mark( ::com::sun::star::uno::Sequence sal_Int32 aOrder =
::com::sun::star::uno::Sequence sal_Int32 () );
void mergeTopMarks( MergeMarksEnum eMergeType = MERGE_MARKS_APPEND );
+void copyTopMarkPush();
+void copyTopMarkPop();
/*
Now create all the overloads in a typesafe way (i.e. without varargs) by
creating a number of overloads
diff --git a/sax/source/tools/fastserializer.cxx
b/sax/source/tools/fastserializer.cxx
index bc2b12e..31aac1e 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -265,6 +265,20 @@ namespace sax_fastparser {
}
}
+void FastSaxSerializer::copyTopMarkPush()
+{
+assert (!maMarkStack.empty());
+maSavedMarkStack.push(boost::shared_ptr ForMerge ( new
ForMerge(*maMarkStack.top(;
+}
+
+void FastSaxSerializer::copyTopMarkPop()
+{
+assert (!maSavedMarkStack.empty());
+maMarkStack.push(maSavedMarkStack.top());
+mergeTopMarks();
+maSavedMarkStack.pop();
+}
+
void FastSaxSerializer::writeBytes( const Sequence ::sal_Int8 aData )
throw ( NotConnectedException, BufferSizeExceededException, IOException,
RuntimeException )
{
if ( maMarkStack.empty() )
diff --git a/sax/source/tools/fastserializer.hxx
b/sax/source/tools/fastserializer.hxx
index b80f1cc..70bc153 100644
--- a/sax/source/tools/fastserializer.hxx
+++ b/sax/source/tools/fastserializer.hxx
@@ -145,6 +145,8 @@ public:
@see mark()
*/
void mergeTopMarks( sax_fastparser::MergeMarksEnum eMergeType =
sax_fastparser::MERGE_MARKS_APPEND );
+void copyTopMarkPush();
+void copyTopMarkPop();
private:
::com::sun::star::uno::Reference ::com::sun::star::io::XOutputStream
mxOutputStream;
@@ -203,6 +205,7 @@ private:
};
::std::stack boost::shared_ptr ForMerge maMarkStack;
+::std::stack boost::shared_ptr ForMerge maSavedMarkStack;
void writeFastAttributeList( const ::com::sun::star::uno::Reference
::com::sun::star::xml::sax::XFastAttributeList Attribs );
void write( const ::rtl::OUString s );
diff --git a/sax/source/tools/fshelper.cxx b/sax/source/tools/fshelper.cxx
index 2f3f7bf..37cf3d0 100644
--- a/sax/source/tools/fshelper.cxx
+++ b/sax/source/tools/fshelper.cxx
@@ -162,6 +162,16 @@ void FastSerializerHelper::mergeTopMarks( MergeMarksEnum
eMergeType )
mpSerializer-mergeTopMarks( eMergeType );
}
+void FastSerializerHelper::copyTopMarkPush()
+{
+mpSerializer-copyTopMarkPush();
+}
+
+void FastSerializerHelper::copyTopMarkPop()
+{
+mpSerializer-copyTopMarkPop();
+}
+
FastAttributeList * FastSerializerHelper::createAttrList()
{
return new FastAttributeList( mxTokenHandler );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] docx export: also export rPr in pPr (paragraph mark stylin...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1649 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1649 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I179363e7d0acc3d6a1f95dcfe975275a9243e863 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] sax: add methods to duplicate current top marker and reapply...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1648 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1648 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3868a822aa9e5210f3d814c68398a38f95072cd5 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: fdo#57938 SwPaM::HasReadonlySel allow editing before comment...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1673
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/73/1673/1
fdo#57938 SwPaM::HasReadonlySel allow editing before commented text ranges
(cherry picked from commit 50b6dc0099ff61050b82a2e37e70d643151e7ce7)
Change-Id: I229602e7783c76e7fc57b78a408f90c1f6a8cda5
---
M sw/source/core/crsr/pam.cxx
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 6d7f07a..e122212 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -699,6 +699,13 @@
if (!bUnhandledMark)
bCommentrangeMark = pFieldmark-GetFieldname() ==
ODF_COMMENTRANGE;
}
+// Allow editing selection right before a commented range.
+if (!bCommentrangeMark GetMark())
+{
+pFieldmark = pMarksAccess-getFieldmarkFor(*GetMark());
+if (pFieldmark)
+bCommentrangeMark = pFieldmark-GetFieldname() ==
ODF_COMMENTRANGE;
+}
}
if (!bRet)
@@ -707,7 +714,7 @@
if ( ( pA == pB ) bUnhandledMark )
bRet = sal_True;
// Allow editing of commented ranges.
-else if (!((pA == pB) bCommentrangeMark))
+else if (!bCommentrangeMark)
{
// Form protection case
bool bAtStartA = pA != NULL pA-GetMarkStart() == *GetPoint();
--
To view, visit https://gerrit.libreoffice.org/1673
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I229602e7783c76e7fc57b78a408f90c1f6a8cda5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Miklos Vajna vmik...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: Template Manager: removed All category
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1674
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/74/1674/1
Template Manager: removed All category
Change-Id: I073b9601c82a464f705df30cfd7e760c212eb7ca
---
M sfx2/source/doc/templatedlg.cxx
M sfx2/source/doc/templatedlg.hrc
M sfx2/source/doc/templatedlg.src
3 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index bff2dc1..7bd3741 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -253,9 +253,6 @@
case FILTER_DRAWS:
eFilter = FILTER_APP_DRAW;
break;
-default:
-case FILTER_ALL:
-;
}
mpCurView-filterTemplatesByApp(eFilter);
return 0;
diff --git a/sfx2/source/doc/templatedlg.hrc b/sfx2/source/doc/templatedlg.hrc
index 02c6702..672575c 100644
--- a/sfx2/source/doc/templatedlg.hrc
+++ b/sfx2/source/doc/templatedlg.hrc
@@ -7,7 +7,6 @@
*/
#define TAB_CONTROL 1
-#define FILTER_ALL 2
#define FILTER_DOCS 3
#define FILTER_PRESENTATIONS4
#define FILTER_SHEETS 5
diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src
index 2480862..a351431 100644
--- a/sfx2/source/doc/templatedlg.src
+++ b/sfx2/source/doc/templatedlg.src
@@ -121,11 +121,6 @@
{
PageItem
{
-Identifier = FILTER_ALL;
-Text [ en-US ] = All;
-};
-PageItem
-{
Identifier = FILTER_DOCS;
Text [ en-US ] = Documents;
};
--
To view, visit https://gerrit.libreoffice.org/1674
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I073b9601c82a464f705df30cfd7e760c212eb7ca
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: Template Manager: filter the results when opening the dialog
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1675
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/75/1675/1
Template Manager: filter the results when opening the dialog
Conflicts:
sfx2/source/control/templateabstractview.cxx
Change-Id: If6cc5f6d5e502c1fc5da210179263be63fc8c8a6
---
M sfx2/source/control/templateabstractview.cxx
M sfx2/source/doc/templatedlg.cxx
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/sfx2/source/control/templateabstractview.cxx
b/sfx2/source/control/templateabstractview.cxx
index f8f20f5..182d833 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -102,7 +102,7 @@
: ThumbnailView(pParent,nWinStyle,bDisableTransientChildren),
mpItemView(new TemplateView(this)),
mbFilteredResults(false),
- meFilterOption(FILTER_APP_NONE)
+ meFilterOption(FILTER_APP_WRITER)
{
mpItemView-setItemStateHdl(LINK(this,TemplateAbstractView,OverlayItemStateHdl));
}
@@ -111,7 +111,7 @@
: ThumbnailView(pParent,rResId,bDisableTransientChildren),
mpItemView(new TemplateView(this)),
mbFilteredResults(false),
- meFilterOption(FILTER_APP_NONE)
+ meFilterOption(FILTER_APP_WRITER)
{
mpItemView-setItemStateHdl(LINK(this,TemplateAbstractView,OverlayItemStateHdl));
}
@@ -174,6 +174,23 @@
}
}
+void TemplateAbstractView::showOverlay (bool bVisible)
+{
+mpItemView-Show(bVisible);
+
+// Clear items is the overlay is closed.
+if (!bVisible)
+{
+// Check if the folder view needs to be filtered
+if (mbFilteredResults)
+{
+filterItems(ViewFilter_Application(meFilterOption));
+}
+
+mpItemView-Clear();
+}
+}
+
void TemplateAbstractView::filterTemplatesByKeyword(const OUString rKeyword)
{
if (mpItemView-IsVisible())
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 7bd3741..388f0cb 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -190,6 +190,8 @@
maView-Populate();
maView-Show();
+mpCurView-filterTemplatesByApp(FILTER_APP_WRITER);
+
FreeResource();
}
--
To view, visit https://gerrit.libreoffice.org/1675
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If6cc5f6d5e502c1fc5da210179263be63fc8c8a6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: REVIEW [4-0-0] [PUSHED 4.0 ] Late Feature: IFERROR and IFNA spreadsheet functions
Hi, On Mon, Jan 14, 2013 at 3:31 PM, Rene Engelhard r...@debian.org wrote: On Mon, Jan 14, 2013 at 02:02:45PM +, Noel Power wrote: On 14/01/13 13:16, Eike Rathke wrote: Hi Noel, On Monday, 2013-01-14 12:49:42 +, Noel Power wrote: [...] ^ I meant to write 4-0-1 there.. somehow I read it as that pushed to 4.0, further reviews needed for 4-0-0 Well, thanks, but, hum.. We don't have a 4-0-0 branch yet, so being on 4-0 now means it will land in 4.0.0 anyhow ... gah you are right ( seems I am too used to 3.6 ) maybe we should at least have the late feature consense in hindsight? yes, Petr, Kendy what's the chances for this, should we wait a day or 2 or just revert now I'd not bother to revert unless that works. Incidentially, I would be against introduding a feature in 4.0.1, but would be OK with doing it before 4.0.0 ;-) Let's keep it! I updated Pootle. Best regards, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: Resolves: fdo#58324 keep both halves of surrogate pairs if g...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1676
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/76/1676/1
Resolves: fdo#58324 keep both halves of surrogate pairs if glyph isn't found
Change-Id: I8fda443bb224a7a99b992611221a65e9869da8b9
---
M vcl/generic/glyphs/gcach_layout.cxx
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/vcl/generic/glyphs/gcach_layout.cxx
b/vcl/generic/glyphs/gcach_layout.cxx
index a8ddc49..a9f373e 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -299,6 +299,16 @@
return ((cChar == 0x200C) || (cChar == 0x200D));
}
+static bool needPreviousCode(sal_Unicode cChar)
+{
+return lcl_CharIsJoiner(cChar) || U16_IS_LEAD(cChar);
+}
+
+static bool needNextCode(sal_Unicode cChar)
+{
+return lcl_CharIsJoiner(cChar) || U16_IS_TRAIL(cChar);
+}
+
//See https://bugs.freedesktop.org/show_bug.cgi?id=31016
#define ARABIC_BANDAID
@@ -439,9 +449,9 @@
if( nCharPos = 0 )
{
rArgs.NeedFallback( nCharPos, bRightToLeft );
-if ( (nCharPos 0)
lcl_CharIsJoiner(rArgs.mpStr[nCharPos-1]) )
+if ( (nCharPos 0)
needPreviousCode(rArgs.mpStr[nCharPos-1]) )
rArgs.NeedFallback( nCharPos-1, bRightToLeft );
-else if ( (nCharPos + 1 nEndRunPos)
lcl_CharIsJoiner(rArgs.mpStr[nCharPos+1]) )
+else if ( (nCharPos + 1 nEndRunPos)
needNextCode(rArgs.mpStr[nCharPos+1]) )
rArgs.NeedFallback( nCharPos+1, bRightToLeft );
}
--
To view, visit https://gerrit.libreoffice.org/1676
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fda443bb224a7a99b992611221a65e9869da8b9
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Caolán McNamara caol...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Replace loop by memset in sal/typesconfig/typesconfig.c
On 01/14/2013 12:42 AM, Marc-André Laverdière wrote: Quick question: is this code security-sensitive at all? No. sal/typesconfig/typesconfig.c turns out to be dead code; I'll removed it. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - desktop/source Repository.mk sal/inc sal/rtl sal/typesconfig
Repository.mk |1
desktop/source/migration/migration.cxx |7
sal/inc/sal/types.h|1
sal/rtl/source/locale.cxx | 41 ---
sal/typesconfig/typesconfig.c | 445 -
5 files changed, 15 insertions(+), 480 deletions(-)
New commits:
commit 34d63e34d9f65ce83564ac310c5857d17147e27f
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Jan 14 17:20:42 2013 +0100
Use std::back_inserter
Change-Id: If87f96b5c616ee6ec70de6aa7f2a58c044f04f3a
diff --git a/desktop/source/migration/migration.cxx
b/desktop/source/migration/migration.cxx
index 82f573f..9005d20 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -20,6 +20,7 @@
#include sal/config.h
#include algorithm
+#include iterator
#include map
#include new
#include set
@@ -712,10 +713,8 @@ strings_v subtract(strings_v const va, strings_v const
vb) {
strings_v b(vb);
std::sort(b.begin(), b.end());
strings_v::iterator be(std::unique(b.begin(), b.end()));
-strings_v c(ae - a.begin());
-strings_v::iterator ce(
-std::set_difference(a.begin(), ae, b.begin(), be, c.begin()));
-c.resize(ce - c.begin());
+strings_v c;
+std::set_difference(a.begin(), ae, b.begin(), be, std::back_inserter(c));
return c;
}
commit e19242c377aa548173e75b57f01108972194f1db
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Jan 14 15:58:13 2013 +0100
Remove obsolete typesconfig
Change-Id: Ic3fd543351637c610621814bb8c8f4fa3cab64fc
diff --git a/Repository.mk b/Repository.mk
index ddf2785..5907c3e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -70,7 +70,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
stringex \
transex3 \
treex \
-typesconfig \
$(if $(filter UCPP,$(BUILD_TYPE)),\
ucpp \
) \
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index 125c098..b04126a 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -27,7 +27,6 @@
#include config_global.h
#endif
-/* Grab __SIZEOFxxx constants from typesconfig tool on Unix */
#if defined UNX
#include sal/typesizes.h
#elif defined(WNT)
diff --git a/sal/typesconfig/typesconfig.c b/sal/typesconfig/typesconfig.c
deleted file mode 100644
index 473f07a..000
--- a/sal/typesconfig/typesconfig.c
+++ /dev/null
@@ -1,445 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include stdio.h
-#include stdlib.h
-#include errno.h
-#include string.h
-
-#include unistd.h
-#include sys/types.h
-
-#include stdarg.h
-
-#include signal.h
-#include setjmp.h
-
-#define printTypeSize(Type,Name)printf( sizeof(%s)\t\t= %d\n, Name,
(int) sizeof (Type) )
-
-#define isSignedType(Type) (((Type)-1) 0)
-#define printTypeSign(Type,Name)printf( %s\t\t= %s %s\n, Name, (
isSignedType(Type) ? signed : unsigned ), Name )
-
-
-/*
-|*
-|* IsBigEndian()
-|*
-|* BeschreibungTrue, wenn CPU BigEndian ist
-|*
-*/
-int IsBigEndian()
-{
- long l = 1;
- return ! *(char*)l;
-}
-
-/*
-|*
-|* Typdeclarations for memory access test functions
-|*
-*/
-typedef enum { t_char, t_short, t_int, t_long, t_double } Type;
-typedef int (*TestFunc)( Type, void* );
-
-
-/*
-|*
-|* PrintArgs()
-|*
-|* BeschreibungTestfunktion fuer variable Parameter
-|*
-*/
-void PrintArgs( int p, ... )
-{
-int value;
-va_list ap;
-
-va_start( ap, p );
-
-printf( value = %d, p );
-
-while ( ( value = va_arg(ap, int) ) != 0 )
- printf( %d, value );
-
-printf( \n );
-va_end(ap);
-}
-
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - vcl/generic
vcl/generic/glyphs/gcach_layout.cxx | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 700da51c5629f3b6a9b7c8e651cabbeb66960731
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jan 14 16:00:58 2013 +
Resolves: fdo#58324 keep both halves of surrogate pairs if glyph isn't found
Change-Id: I8fda443bb224a7a99b992611221a65e9869da8b9
Reviewed-on: https://gerrit.libreoffice.org/1676
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/vcl/generic/glyphs/gcach_layout.cxx
b/vcl/generic/glyphs/gcach_layout.cxx
index a8ddc49..a9f373e 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -299,6 +299,16 @@ static bool lcl_CharIsJoiner(sal_Unicode cChar)
return ((cChar == 0x200C) || (cChar == 0x200D));
}
+static bool needPreviousCode(sal_Unicode cChar)
+{
+return lcl_CharIsJoiner(cChar) || U16_IS_LEAD(cChar);
+}
+
+static bool needNextCode(sal_Unicode cChar)
+{
+return lcl_CharIsJoiner(cChar) || U16_IS_TRAIL(cChar);
+}
+
//See https://bugs.freedesktop.org/show_bug.cgi?id=31016
#define ARABIC_BANDAID
@@ -439,9 +449,9 @@ bool IcuLayoutEngine::layout(ServerFontLayout rLayout,
ImplLayoutArgs rArgs)
if( nCharPos = 0 )
{
rArgs.NeedFallback( nCharPos, bRightToLeft );
-if ( (nCharPos 0)
lcl_CharIsJoiner(rArgs.mpStr[nCharPos-1]) )
+if ( (nCharPos 0)
needPreviousCode(rArgs.mpStr[nCharPos-1]) )
rArgs.NeedFallback( nCharPos-1, bRightToLeft );
-else if ( (nCharPos + 1 nEndRunPos)
lcl_CharIsJoiner(rArgs.mpStr[nCharPos+1]) )
+else if ( (nCharPos + 1 nEndRunPos)
needNextCode(rArgs.mpStr[nCharPos+1]) )
rArgs.NeedFallback( nCharPos+1, bRightToLeft );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-4-0]: Resolves: fdo#58324 keep both halves of surrogate pairs if g...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1676 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1676 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8fda443bb224a7a99b992611221a65e9869da8b9 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - wizards/com
wizards/com/sun/star/wizards/text/TextDocument.py |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit b5c1b435378e1e4c99416eb865477123ab596c85 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Jan 14 14:03:40 2013 +0100 fdo#59248: Remove remaining dangling view of ViewHandler.py ...that had been left behind by d6308705133ccde121dcd40f94a1d4367356630b pywizards: get rid of ViewHandler and caused from .LetterWizardDialogImpl import LetterWizardDialogImpl in CallWizard.py to fail. Change-Id: I51dcb2812863f502bc06e3e3b07285f6c31714ca (cherry picked from commit 155600869800a0b51f9787b8a1879d3c680342c3) Reviewed-on: https://gerrit.libreoffice.org/1670 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/wizards/com/sun/star/wizards/text/TextDocument.py b/wizards/com/sun/star/wizards/text/TextDocument.py index 150b0bf..5502978 100644 --- a/wizards/com/sun/star/wizards/text/TextDocument.py +++ b/wizards/com/sun/star/wizards/text/TextDocument.py @@ -19,7 +19,6 @@ import uno import traceback import time from datetime import date as dateTimeObject -from .ViewHandler import ViewHandler from .TextFieldHandler import TextFieldHandler from ..document.OfficeDocument import OfficeDocument from ..common.Desktop import Desktop @@ -142,10 +141,8 @@ class TextDocument(object): self.DocSize = self.getPageSize() -myViewHandler = ViewHandler(self.xTextDocument, self.xTextDocument) try: -myViewHandler.setViewSetting( -ZoomType, ENTIRE_PAGE) +self.xTextDocument.CurrentController.ViewSettings.ZoomType = ENTIRE_PAGE except Exception: traceback.print_exc() myFieldHandler = TextFieldHandler(self.xMSF, self.xTextDocument) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-4-0]: fdo#59248: Remove remaining dangling view of ViewHandler.py
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1670 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1670 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I51dcb2812863f502bc06e3e3b07285f6c31714ca Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: fdo#59366: Document Conversion wizard: enable StarOffice a...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1677 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/77/1677/1 fdo#59366: Document Conversion wizard: enable StarOffice again: The createBF_MigrateFilterIfPossible function does not actually return its intended return value, so the dialog never shows the StarOffice button. (regression from f3e40273b699910108007faf8a7991fe0498ad97) Change-Id: I8a72a4e16b23ffda01caf3207127de628afc4036 --- M wizards/source/importwizard/Main.xba 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wizards/source/importwizard/Main.xba b/wizards/source/importwizard/Main.xba index 7385c6b..fdea2f9 100644 --- a/wizards/source/importwizard/Main.xba +++ b/wizards/source/importwizard/Main.xba @@ -190,7 +190,7 @@ Dim oService On Error Goto RTError oService = createUnoService(quot;com.sun.star.comp.office.BF_MigrateFilterquot;) -getBinFilterCompIfItExists = oService +createBF_MigrateFilterIfPossible = oService Exit Function RTError: createBF_MigrateFilterIfPossible = Nothing -- To view, visit https://gerrit.libreoffice.org/1677 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a72a4e16b23ffda01caf3207127de628afc4036 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: Template Manager: show folders with 4 previews inside a roun...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1678
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/1678/1
Template Manager: show folders with 4 previews inside a rounded rect
The previous display had the inconvenient to be misleading if there was
one or no template inside a folder.
Change-Id: I16faa2556ca02380bd4dac0d821ecac45b98b8c3
---
M sfx2/inc/sfx2/templatecontaineritem.hxx
M sfx2/source/control/templateabstractview.cxx
M sfx2/source/control/templatecontaineritem.cxx
M sfx2/source/control/templatelocalview.cxx
M sfx2/source/control/thumbnailviewitem.cxx
5 files changed, 131 insertions(+), 63 deletions(-)
diff --git a/sfx2/inc/sfx2/templatecontaineritem.hxx
b/sfx2/inc/sfx2/templatecontaineritem.hxx
index 2c2d18b..4768604 100644
--- a/sfx2/inc/sfx2/templatecontaineritem.hxx
+++ b/sfx2/inc/sfx2/templatecontaineritem.hxx
@@ -18,19 +18,26 @@
public:
BitmapEx maPreview2;
+BitmapEx maPreview3;
+BitmapEx maPreview4;
std::vectorTemplateItemProperties maTemplates;
TemplateContainerItem (ThumbnailView rView);
virtual ~TemplateContainerItem ();
-const Point getPrev2Pos () const { return maPrev2Pos; }
-
virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor,
const ThumbnailItemAttributes *pAttrs);
+
+virtual void calculateItemsPosition (const long nThumbnailHeight, const
long nDisplayHeight,
+ const long nPadding, sal_uInt32
nMaxTextLenght,
+ const ThumbnailItemAttributes
*pAttrs);
+
+bool HasMissingPreview( );
+
private:
-Point maPrev2Pos;
+Rectangle maThumbnailArea;
};
#endif // TEMPLATEFOLDERVIEWITEM_HXX
diff --git a/sfx2/source/control/templateabstractview.cxx
b/sfx2/source/control/templateabstractview.cxx
index f8f20f5..4439725 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -65,8 +65,10 @@
// Clear thumbnails
pContainerItem-maPreview1.Clear();
pContainerItem-maPreview2.Clear();
+pContainerItem-maPreview3.Clear();
+pContainerItem-maPreview4.Clear();
-for (size_t i = 0, n = rTemplates.size(); i n; ++i)
+for (size_t i = 0, n = rTemplates.size(); i n
pContainerItem-HasMissingPreview(); ++i)
{
if (isValid(rTemplates[i].aPath))
{
@@ -83,6 +85,18 @@
TEMPLATE_THUMBNAIL_MAX_WIDTH*0.75,
TEMPLATE_THUMBNAIL_MAX_HEIGHT*0.75);
}
+else if ( pContainerItem-maPreview3.IsEmpty() )
+{
+pContainerItem-maPreview3 =
TemplateAbstractView::scaleImg(rTemplates[i].aThumbnail,
+
TEMPLATE_THUMBNAIL_MAX_WIDTH*0.75,
+
TEMPLATE_THUMBNAIL_MAX_HEIGHT*0.75);
+}
+else if ( pContainerItem-maPreview4.IsEmpty() )
+{
+pContainerItem-maPreview4 =
TemplateAbstractView::scaleImg(rTemplates[i].aThumbnail,
+
TEMPLATE_THUMBNAIL_MAX_WIDTH*0.75,
+
TEMPLATE_THUMBNAIL_MAX_HEIGHT*0.75);
+}
}
}
diff --git a/sfx2/source/control/templatecontaineritem.cxx
b/sfx2/source/control/templatecontaineritem.cxx
index d63ce8a..25fa5fe 100644
--- a/sfx2/source/control/templatecontaineritem.cxx
+++ b/sfx2/source/control/templatecontaineritem.cxx
@@ -8,6 +8,7 @@
*/
#include sfx2/templatecontaineritem.hxx
+#include sfx2/templateabstractview.hxx
#include basegfx/matrix/b2dhommatrixtools.hxx
#include basegfx/polygon/b2dpolygon.hxx
@@ -35,16 +36,31 @@
{
}
+void TemplateContainerItem::calculateItemsPosition (const long
nThumbnailHeight, const long nDisplayHeight,
+ const long nPadding, sal_uInt32
nMaxTextLenght,
+ const ThumbnailItemAttributes *pAttrs)
+{
+ThumbnailViewItem::calculateItemsPosition( nThumbnailHeight,
nDisplayHeight, nPadding, nMaxTextLenght, pAttrs);
+Point aPos (maDrawArea.getX() + nPadding, maDrawArea.getY() + nPadding);
+maThumbnailArea = Rectangle(aPos, Size(maDrawArea.GetWidth() - 2 *
nPadding, nThumbnailHeight));
+}
+
void TemplateContainerItem::Paint (drawinglayer::processor2d::BaseProcessor2D
*pProcessor,
const ThumbnailItemAttributes *pAttrs)
{
int nCount = 0;
-int nSeqSize = 2;
+int nSeqSize = 3;
if (!maPreview1.IsEmpty())
nSeqSize += 3;
if
[Libreoffice-commits] .: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo44053.rtf | 15 +++
sw/qa/extras/rtfimport/rtfimport.cxx | 13 ++
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 31 ---
writerfilter/source/dmapper/DomainMapperTableManager.hxx |3 -
writerfilter/source/dmapper/DomainMapper_Impl.hxx|2
5 files changed, 31 insertions(+), 33 deletions(-)
New commits:
commit d276d3f3ae112a11c8cb5768650d147cbb94275e
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Jan 14 17:26:35 2013 +0100
fdo#44053 fix this again and this time add a testcase as well
This was about importing RTF tables where different rows had different
number of cells. In the meantime, a better implementation was added for
DOCX, just using that for RTF fixes the import of this bugdoc.
Also fixes a crasher while loading ooo43817-1.rtf.
Change-Id: I0970275272eca7f33a442bd6acc97a4f8d9dabeb
diff --git a/sw/qa/extras/rtfimport/data/fdo44053.rtf
b/sw/qa/extras/rtfimport/data/fdo44053.rtf
new file mode 100644
index 000..ef5f975
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo44053.rtf
@@ -0,0 +1,15 @@
+{\rtf1
+Title\par
+\trowd \cellx550\cellx7000
+000\cell
+Name\cell
+\pard
+\trowd \cellx550\cellx7000\row
+\trowd \cellx550\cellx1650\cellx5550\cellx7000
+\cell
+\pard \intbl
+Cell1\cell\cell\cell
+\pard
+\trowd \cellx550\cellx1650\cellx5550\cellx7000\row
+\pard\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 296a89e..4f5b8c0 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -135,6 +135,7 @@ public:
void testFdo45183();
void testFdo54612();
void testFdo58933();
+void testFdo44053();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -220,6 +221,7 @@ void Test::run()
{fdo45183.rtf, Test::testFdo45183},
{fdo54612.rtf, Test::testFdo54612},
{fdo58933.rtf, Test::testFdo58933},
+{fdo44053.rtf, Test::testFdo44053},
};
header();
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
@@ -1026,6 +1028,17 @@ void Test::testFdo58933()
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTable-getCellNames().getLength());
}
+void Test::testFdo44053()
+{
+uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xTables(xTablesSupplier-getTextTables( ), uno::UNO_QUERY);
+uno::Referencetext::XTextTable xTextTable(xTables-getByIndex(0),
uno::UNO_QUERY);
+uno::Referencetable::XTableRows xTableRows(xTextTable-getRows(),
uno::UNO_QUERY);
+// The with of the table's A1 and A2 cell should equal.
+CPPUNIT_ASSERT_EQUAL(getProperty
uno::Sequencetext::TableColumnSeparator (xTableRows-getByIndex(0),
TableColumnSeparators)[0].Position,
+getProperty uno::Sequencetext::TableColumnSeparator
(xTableRows-getByIndex(1), TableColumnSeparators)[0].Position);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index afe9d6c..448d6e1 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star;
using namespace ::std;
-DomainMapperTableManager::DomainMapperTableManager(bool bOOXML, bool
bImplicitMerges) :
+DomainMapperTableManager::DomainMapperTableManager(bool bOOXML) :
m_nRow(0),
m_nCell(),
m_nGridSpan(1),
@@ -51,7 +51,6 @@ DomainMapperTableManager::DomainMapperTableManager(bool
bOOXML, bool bImplicitMe
m_nHeaderRepeat(0),
m_nTableWidth(0),
m_bOOXML( bOOXML ),
-m_bImplicitMerges(bImplicitMerges),
m_bPushCurrentWidth(false),
m_pTablePropsHandler( new TablePropertiesHandler( bOOXML ) )
{
@@ -532,34 +531,6 @@ void DomainMapperTableManager::endOfRowAction()
#endif
insertRowProps(pPropMap);
}
-else if (m_bImplicitMerges pTableGrid-size())
-{
-// More grid than cells definitions? Then take the last ones.
-// This feature is used by the RTF implicit horizontal cell merges.
-uno::Sequence text::TableColumnSeparator aSeparators(m_nCell.back(
) - 1);
-text::TableColumnSeparator* pSeparators = aSeparators.getArray();
-
-sal_Int16 nSum = 0;
-sal_uInt32 nPos = 0;
-sal_uInt32 nSizeTableGrid = pTableGrid-size();
-// Ignoring the i=0 case means we assume that the width of the last
cell matches the table width
-for (sal_uInt32 i = m_nCell.back( ); i 1 nSizeTableGrid = i; i--)
-{
-nSum += (*pTableGrid.get())[pTableGrid-size() - i]; // Size of
the current cell
-pSeparators[nPos].Position = nSum * nFullWidthRelative /
nFullWidth; // Relative position
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - wizards/source
wizards/source/importwizard/Main.xba |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 959ce73b266d3639ff1ced9cb980adf5fe643ad5 Author: Michael Stahl mst...@redhat.com Date: Mon Jan 14 17:27:26 2013 +0100 fdo#59366: Document Conversion wizard: enable StarOffice again: The createBF_MigrateFilterIfPossible function does not actually return its intended return value, so the dialog never shows the StarOffice button. (regression from f3e40273b699910108007faf8a7991fe0498ad97) Change-Id: I8a72a4e16b23ffda01caf3207127de628afc4036 Reviewed-on: https://gerrit.libreoffice.org/1677 Reviewed-by: Noel Power noel.po...@suse.com Tested-by: Noel Power noel.po...@suse.com diff --git a/wizards/source/importwizard/Main.xba b/wizards/source/importwizard/Main.xba index 7385c6b..fdea2f9 100644 --- a/wizards/source/importwizard/Main.xba +++ b/wizards/source/importwizard/Main.xba @@ -190,7 +190,7 @@ Function createBF_MigrateFilterIfPossible() Dim oService On Error Goto RTError oService = createUnoService(quot;com.sun.star.comp.office.BF_MigrateFilterquot;) -getBinFilterCompIfItExists = oService +createBF_MigrateFilterIfPossible = oService Exit Function RTError: createBF_MigrateFilterIfPossible = Nothing ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-6]: fdo#59366: Document Conversion wizard: enable StarOffice a...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1677 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1677 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a72a4e16b23ffda01caf3207127de628afc4036 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Stepping back from The Document Foundation
Hi Florian, So - first, this belongs on the discuss list - please follow up there and not on the developers list where it is out of scope. On Sun, 2013-01-13 at 16:54 +0100, Florian Monfort wrote: And that has consequences: we're too slow -acting.. As a foundation - IMHO we're pretty good at decision making :-) at least - compared to larger companies; still we're worse than small consultancy outfits. And you can talk about contributors, but the thing is, here it is totally different: those guys are paid by Red Hat, Canonical or SuSe. One third of our patches (and often the coolest ones that are not commercially driven but really improve stuff), come from un-affiliated volunteers. The truth is the community is mainly made of people who are paid full time for it: so YES, we should promote an actual product, not a community that is practically non existent. I don't know where you get this 'truth' from :-) But it looks like speaking of a commercial offer would sound crazy. What do you want to sell ? if it is such a good idea - why can't you start a VC funded firm (or whatever) to produce it, and be part of the LibreOffice community along-side other companies that make a business out of supporting and developing the project their derived products ? Is there any real need to bet TDF's success on some business venture, for-pay-product etc. ? Ultimately we're a charitable non-profit foundation. Don't let me discourage you doing that though - if you have a good idea: start a business, and if it helps LibreOffice I'd be happy to help you help us. Well I'm sorry to say I disagree with all this, and I'm thinking this is too bad: LibreOffice could actually grow faster and with a larger community, if at least people were capable of recognizing that business is the actual model to adopt Seriously; we have applied a -lot- of brain cycles collectively to the problem of how to make the project self-sustaining (OpenOffice was not), and create opportunity for businesses around it. If you're aware of some magic bullet that we are not - please discuss it on discuss@. If you can raise seed funding for your idea - I'd be most happy to help identify people to hire, etc. Anyhow - again, please follow-up only on discuss. Thanks for your contribution ! I'm sorry we didn't manage to met your high expectations :-) All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: strange behaviour of SwCrsrShell::aVisArea
Hi Cedric, I don't know that area of the code too well, but this smells pretty bad. May be looking at what changes the aVisArea to these (false) values would help. Thank you for your reply. I started collecting more traces; the present situation is that the strange behaviour is probably caused by getting the aVisArea data after zooming and before refocussing. This makes that what you see is not what you get from the traces ... Let's hope that the extra traces will give me a) the information I need to submit a follow-up patch and b) show that there is no bad smell - apart from my misinterpretations ;) Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Resolves: fdo#44718 Add Unicode 2034 (Triple Prime) to OpenS...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1679 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/79/1679/1 Resolves: fdo#44718 Add Unicode 2034 (Triple Prime) to OpenSymbol This adds glyphs for prime (U+2032), double prime (U+2033) and triple prime (U+2034). Change-Id: I73297209f0410db607c1ae4787ba15c3ac08133f --- M extras/source/truetype/symbol/OpenSymbol.sfd 1 file changed, 68 insertions(+), 6 deletions(-) diff --git a/extras/source/truetype/symbol/OpenSymbol.sfd b/extras/source/truetype/symbol/OpenSymbol.sfd index a2169dc..53a85c0 100644 --- a/extras/source/truetype/symbol/OpenSymbol.sfd +++ b/extras/source/truetype/symbol/OpenSymbol.sfd @@ -4,7 +4,7 @@ FamilyName: OpenSymbol Weight: Book Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 Julien Nabet\nPRECEDES - DOES NOT SUCCEED (c) 2011 Olivier Hallot -Version: 102.2 +Version: 102.3 ItalicAngle: 0 UnderlinePosition: -143 UnderlineWidth: 20 @@ -19,7 +19,7 @@ OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1144938807 -ModificationTime: 1321359108 +ModificationTime: 1358186116 PfmFamily: 81 TTFWeight: 400 TTFWidth: 5 @@ -773,18 +773,18 @@ 0 0 EndShort -LangName: 1033 Regular OpenSymbol Version 102.2 -GaspTable: 1 65535 2 +LangName: 1033 Regular OpenSymbol Version 102.3 +GaspTable: 1 65535 2 0 Encoding: Custom UnicodeInterp: none NameList: Adobe Glyph List DisplaySize: -24 AntiAlias: 1 FitToEm: 1 -WinInfo: 360 45 15 +WinInfo: 0 45 15 BeginPrivate: 0 EndPrivate -BeginChars: 1001 1001 +BeginChars: 8834 1004 StartChar: Alpha Encoding: 909 913 0 @@ -107629,5 +107629,67 @@ 859 592 859 592 795 615 c 1,22,-1 EndSplineSet EndChar + +StartChar: prime +Encoding: 2032 8242 1001 +Width: 681 +Flags: WO +HStem: 1110 346 +VStem: 236 329 +LayerCount: 2 +Fore +SplineSet +565 1456 m 5,0,-1 + 270 1110 l 5,1,-1 + 236 1110 l 5,2,-1 + 342 1456 l 5,3,-1 + 565 1456 l 5,0,-1 +EndSplineSet +EndChar + +StartChar: primedbl +Encoding: 2033 8243 1002 +Width: 957 +Flags: W +LayerCount: 2 +Fore +SplineSet +565 1456 m 1,0,-1 + 270 1110 l 1,1,-1 + 236 1110 l 1,2,-1 + 342 1456 l 1,3,-1 + 565 1456 l 1,0,-1 +841 1456 m 1,4,-1 + 546 1110 l 1,5,-1 + 512 1110 l 1,6,-1 + 618 1456 l 1,7,-1 + 841 1456 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: primetriple +Encoding: 2034 8244 1003 +Width: 1233 +Flags: W +LayerCount: 2 +Fore +SplineSet +565 1456 m 1,0,-1 + 270 1110 l 1,1,-1 + 236 1110 l 1,2,-1 + 342 1456 l 1,3,-1 + 565 1456 l 1,0,-1 +841 1456 m 1,4,-1 + 546 1110 l 1,5,-1 + 512 1110 l 1,6,-1 + 618 1456 l 1,7,-1 + 841 1456 l 1,4,-1 +1117 1456 m 1,8,-1 + 822 1110 l 1,9,-1 + 788 1110 l 1,10,-1 + 894 1456 l 1,11,-1 + 1117 1456 l 1,8,-1 +EndSplineSet +EndChar EndChars EndSplineFont -- To view, visit https://gerrit.libreoffice.org/1679 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I73297209f0410db607c1ae4787ba15c3ac08133f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mathias Hasselmann math...@openismus.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sdext/source
sdext/source/pdfimport/tree/pdfiprocessor.cxx | 14 +++---
sdext/source/pdfimport/tree/pdfiprocessor.hxx | 23 ---
2 files changed, 11 insertions(+), 26 deletions(-)
New commits:
commit 460c55f620a1bab7aa8f740dc85a60ce0cdf583c
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Jan 13 14:01:57 2013 +0100
Modify constructor, remove setters + unused define
Change-Id: Ibf878c44ae761e59a04b6d5023296c5918cbf85e
Reviewed-on: https://gerrit.libreoffice.org/1665
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index b166a37..01585e5 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -440,19 +440,11 @@ void PDFIProcessor::drawGlyphLine( const rtl::OUString
rGlyphs,
processGlyphLine();
}
-CharGlyph aGlyph;
+CharGlyph aGlyph(fXPrevTextPosition, fYPrevTextPosition, fPrevTextHeight,
fPrevTextWidth,
+ m_pCurElement, getCurrentContext(), rFontMatrix, rRect,
rGlyphs);
-aGlyph.setGlyph ( rGlyphs );
-aGlyph.setRect ( rRect );
-aGlyph.setFontMatrix ( rFontMatrix );
-aGlyph.setGraphicsContext ( getCurrentContext() );
-getGCId(getCurrentContext());
-aGlyph.setCurElement( m_pCurElement );
-aGlyph.setYPrevGlyphPosition( fYPrevTextPosition );
-aGlyph.setXPrevGlyphPosition( fXPrevTextPosition );
-aGlyph.setPrevGlyphHeight ( fPrevTextHeight );
-aGlyph.setPrevGlyphWidth ( fPrevTextWidth );
+getGCId(getCurrentContext());
m_GlyphsList.push_back( aGlyph );
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
index a288c64..1e4af25 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
@@ -242,7 +242,13 @@ namespace pdfi
class CharGlyph
{
public:
-CharGlyph(){};
+CharGlyph(double fXPrevGlyphPosition, double fYPrevGlyphPosition,
double fPrevGlyphHeight, double fPrevGlyphWidth,
+ Element* pCurElement, const GraphicsContext rCurrentContext,
const com::sun::star::geometry::Matrix2D rFontMatrix,
+ const com::sun::star::geometry::RealRectangle2D rRect, const
rtl::OUString rGlyphs )
+ : m_fXPrevGlyphPosition(fXPrevGlyphPosition),
m_fYPrevGlyphPosition(fYPrevGlyphPosition),
m_fPrevGlyphHeight(fPrevGlyphHeight),
+ m_fPrevGlyphWidth(fPrevGlyphWidth),
m_pCurElement(pCurElement), m_rCurrentContext(rCurrentContext),
+ m_rFontMatrix(rFontMatrix), m_rRect(rRect),
m_rGlyphs(rGlyphs) {};
+
virtual ~CharGlyph(){};
rtl::OUString getGlyph(){ return m_rGlyphs; }
com::sun::star::geometry::RealRectangle2D getRect(){ return
m_rRect; }
@@ -250,12 +256,6 @@ namespace pdfi
GraphicsContext getGC(){ return m_rCurrentContext; }
Element* getCurElement(){ return m_pCurElement; }
-void setGlyph (const rtl::OUString rGlyphs ){ m_rGlyphs=rGlyphs;
}
-void setRect (const ::com::sun::star::geometry::RealRectangle2D
rRect ){ m_rRect=rRect; }
-void setFontMatrix (const ::com::sun::star::geometry::Matrix2D
rFontMatrix ){ m_rFontMatrix= rFontMatrix; }
-void setGraphicsContext (GraphicsContext rCurrentContext ){
m_rCurrentContext= rCurrentContext; }
-void setCurElement( Element* pCurElement ){ m_pCurElement=
pCurElement; }
-
double getYPrevGlyphPosition() const { return
m_fYPrevGlyphPosition; }
double getXPrevGlyphPosition() const { return
m_fXPrevGlyphPosition; }
double getPrevGlyphHeight() const { return m_fPrevGlyphHeight; }
@@ -268,15 +268,10 @@ namespace pdfi
return m_rRect.X1-m_fXPrevGlyphPosition;
}
-void setYPrevGlyphPosition( double fYPrevTextPosition ){
m_fYPrevGlyphPosition= fYPrevTextPosition; }
-void setXPrevGlyphPosition( double fXPrevTextPosition ){
m_fXPrevGlyphPosition= fXPrevTextPosition; }
-void setPrevGlyphHeight ( double fPrevTextHeight ){
m_fPrevGlyphHeight= fPrevTextHeight; }
-void setPrevGlyphWidth( double fPrevTextWidth ){
m_fPrevGlyphWidth= fPrevTextWidth; }
-
private:
-double m_fYPrevGlyphPosition ;
double m_fXPrevGlyphPosition ;
+double m_fYPrevGlyphPosition ;
double m_fPrevGlyphHeight ;
double m_fPrevGlyphWidth ;
Element*m_pCurElement ;
@@ -287,8 +282,6 @@ namespace pdfi
};
}
-#define USTR(x) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( x ) )
-
#endif
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 4 commits - reportdesign/inc reportdesign/source sc/inc sc/source sd/source starmath/source sw/source
reportdesign/inc/ReportDefinition.hxx |3 --
reportdesign/source/core/api/ReportDefinition.cxx | 24 +++---
sc/inc/xmlwrap.hxx|2 -
sc/source/filter/xml/xmlwrap.cxx | 14 +---
sd/source/filter/xml/sdxmlwrp.cxx | 21 ++-
starmath/source/mathmlexport.cxx | 16 ++
starmath/source/mathmlexport.hxx |3 --
sw/source/filter/xml/wrtxml.cxx | 18
sw/source/filter/xml/wrtxml.hxx |3 --
9 files changed, 33 insertions(+), 71 deletions(-)
New commits:
commit a6892bd5511bac086000efac9c865a5a148202dc
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Nov 14 16:03:48 2012 +0100
Fix fdo#51121 OWA misbehaviour with uncompressed meta.xml
Change draw/impress to save ODF with compressed meta.xml as well,
since there's no reason not to.
Change-Id: I856e716b1e673cffe3b483628d934ab2c7d7271b
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx
b/sd/source/filter/xml/sdxmlwrp.cxx
index eaf5285..fcde136 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -160,7 +160,6 @@ struct XML_SERVICEMAP
{
const sal_Char* mpService;
const sal_Char* mpStream;
-sal_Bool mbPlain;
};
struct XML_SERVICES
@@ -1012,22 +1011,18 @@ sal_Bool SdXMLFilter::Export()
XML_SERVICEMAP aServices[5]; sal_uInt16 i = 0;
aServices[i ].mpService = pServiceNames-mpStyles;
-aServices[i ].mpStream = sXML_styleStreamName;
-aServices[i++].mbPlain = sal_False;
+aServices[i++].mpStream = sXML_styleStreamName;
aServices[i ].mpService = pServiceNames-mpContent;
-aServices[i ].mpStream = sXML_contentStreamName;
-aServices[i++].mbPlain = sal_False;
+aServices[i++].mpStream = sXML_contentStreamName;
aServices[i ].mpService = pServiceNames-mpSettings;
-aServices[i ].mpStream = sXML_settingsStreamName;
-aServices[i++].mbPlain = sal_False;
+aServices[i++].mpStream = sXML_settingsStreamName;
if( mrDocShell.GetCreateMode() != SFX_CREATE_MODE_EMBEDDED )
{
aServices[i ].mpService = pServiceNames-mpMeta;
-aServices[i ].mpStream = sXML_metaStreamName;
-aServices[i++].mbPlain = sal_True;
+aServices[i++].mpStream = sXML_metaStreamName;
};
aServices[i].mpService = NULL;
@@ -1060,11 +1055,9 @@ sal_Bool SdXMLFilter::Export()
uno::Any aAny; aAny = OUString( text/xml);
xProps-setPropertyValue( MediaType , aAny);
-OUString aUseCommonPassPropName(
UseCommonStoragePasswordEncryption);
-if( pServices-mbPlain )
-xProps-setPropertyValue( Compressed , uno::makeAny(
(sal_Bool) sal_False ) );
-// if the document is encrypted even the plain streams
should be encrypted
-xProps-setPropertyValue( aUseCommonPassPropName,
uno::makeAny( (sal_Bool)sal_True ) );
+// encrypt all streams
+xProps-setPropertyValue(
UseCommonStoragePasswordEncryption,
+ uno::makeAny( (sal_Bool)sal_True
) );
const OUString sStreamName( StreamName);
xInfoSet-setPropertyValue( sStreamName, Any( sDocName ) );
commit 28e6acb724671e72bd4e2e207a61fee0c94c432b
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Nov 14 16:37:40 2012 +0100
Fix fdo#51121 OWA misbehaviour with uncompressed meta.xml
Change reportdesigner to save ODF with compressed meta.xml as well,
since there's no reason not to.
Change-Id: I9129f83ea8e5e8a20e3b6395643e8ca93c32f04a
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/reportdesign/inc/ReportDefinition.hxx
b/reportdesign/inc/ReportDefinition.hxx
index fe7fc36..912e57d 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -140,8 +140,7 @@ namespace reportdesign
/// output descriptor
const ::com::sun::star::uno::Sequence
::com::sun::star::beans::PropertyValue rMediaDesc,
-sal_Bool bPlainStream
-, const ::com::sun::star::uno::Reference
::com::sun::star::embed::XStorage _xStorageToSaveTo); /// neither
compress nor encrypt
+const ::com::sun::star::uno::Reference
::com::sun::star::embed::XStorage _xStorageToSaveTo);
/// write a single output stream
/// (to be called either directly or by WriteThroughComponent(...))
diff --git
[PUSHED] Modify constructor, remove setters + unused define
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1665 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1665 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibf878c44ae761e59a04b6d5023296c5918cbf85e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Julien Nabet serval2...@yahoo.fr Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 2 commits - sfx2/source
sfx2/source/control/templateabstractview.cxx | 21 +++--
sfx2/source/doc/templatedlg.cxx |5 ++---
sfx2/source/doc/templatedlg.hrc |1 -
sfx2/source/doc/templatedlg.src |5 -
4 files changed, 21 insertions(+), 11 deletions(-)
New commits:
commit a98e717ba315b51fd2e9e3a4e12edfbc75f287be
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Wed Jan 9 15:18:17 2013 +0100
Template Manager: filter the results when opening the dialog
Conflicts:
sfx2/source/control/templateabstractview.cxx
Change-Id: If6cc5f6d5e502c1fc5da210179263be63fc8c8a6
Reviewed-on: https://gerrit.libreoffice.org/1675
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sfx2/source/control/templateabstractview.cxx
b/sfx2/source/control/templateabstractview.cxx
index f8f20f5..182d833 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -102,7 +102,7 @@ TemplateAbstractView::TemplateAbstractView (Window
*pParent, WinBits nWinStyle,
: ThumbnailView(pParent,nWinStyle,bDisableTransientChildren),
mpItemView(new TemplateView(this)),
mbFilteredResults(false),
- meFilterOption(FILTER_APP_NONE)
+ meFilterOption(FILTER_APP_WRITER)
{
mpItemView-setItemStateHdl(LINK(this,TemplateAbstractView,OverlayItemStateHdl));
}
@@ -111,7 +111,7 @@ TemplateAbstractView::TemplateAbstractView(Window *pParent,
const ResId rResId,
: ThumbnailView(pParent,rResId,bDisableTransientChildren),
mpItemView(new TemplateView(this)),
mbFilteredResults(false),
- meFilterOption(FILTER_APP_NONE)
+ meFilterOption(FILTER_APP_WRITER)
{
mpItemView-setItemStateHdl(LINK(this,TemplateAbstractView,OverlayItemStateHdl));
}
@@ -174,6 +174,23 @@ void TemplateAbstractView::filterTemplatesByApp (const
FILTER_APPLICATION eApp)
}
}
+void TemplateAbstractView::showOverlay (bool bVisible)
+{
+mpItemView-Show(bVisible);
+
+// Clear items is the overlay is closed.
+if (!bVisible)
+{
+// Check if the folder view needs to be filtered
+if (mbFilteredResults)
+{
+filterItems(ViewFilter_Application(meFilterOption));
+}
+
+mpItemView-Clear();
+}
+}
+
void TemplateAbstractView::filterTemplatesByKeyword(const OUString rKeyword)
{
if (mpItemView-IsVisible())
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 7bd3741..388f0cb 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -190,6 +190,8 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window
*parent)
maView-Populate();
maView-Show();
+mpCurView-filterTemplatesByApp(FILTER_APP_WRITER);
+
FreeResource();
}
commit c61861f870385f0cfbf8f5aa1b8d301475c6a73e
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Wed Jan 9 14:22:23 2013 +0100
Template Manager: removed All category
Change-Id: I073b9601c82a464f705df30cfd7e760c212eb7ca
Reviewed-on: https://gerrit.libreoffice.org/1674
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index bff2dc1..7bd3741 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -253,9 +253,6 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg,ActivatePageHdl)
case FILTER_DRAWS:
eFilter = FILTER_APP_DRAW;
break;
-default:
-case FILTER_ALL:
-;
}
mpCurView-filterTemplatesByApp(eFilter);
return 0;
diff --git a/sfx2/source/doc/templatedlg.hrc b/sfx2/source/doc/templatedlg.hrc
index 02c6702..672575c 100644
--- a/sfx2/source/doc/templatedlg.hrc
+++ b/sfx2/source/doc/templatedlg.hrc
@@ -7,7 +7,6 @@
*/
#define TAB_CONTROL 1
-#define FILTER_ALL 2
#define FILTER_DOCS 3
#define FILTER_PRESENTATIONS4
#define FILTER_SHEETS 5
diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src
index 2480862..a351431 100644
--- a/sfx2/source/doc/templatedlg.src
+++ b/sfx2/source/doc/templatedlg.src
@@ -121,11 +121,6 @@ ModelessDialog DLG_TEMPLATE_MANAGER
{
PageItem
{
-Identifier = FILTER_ALL;
-Text [ en-US ] = All;
-};
-PageItem
-{
Identifier = FILTER_DOCS;
Text [ en-US ] = Documents;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sfx2/inc sfx2/source
sfx2/inc/sfx2/templatecontaineritem.hxx | 13 +-
sfx2/source/control/templateabstractview.cxx | 16 ++
sfx2/source/control/templatecontaineritem.cxx | 156 +++---
sfx2/source/control/templatelocalview.cxx | 18 ++-
sfx2/source/control/thumbnailviewitem.cxx |5
5 files changed, 138 insertions(+), 70 deletions(-)
New commits:
commit d75d7a5108346c3e84859e5946d49f11f8d7d785
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Mon Jan 14 16:50:03 2013 +0100
Template Manager: show folders with 4 previews inside a rounded rect
The previous display had the inconvenient to be misleading if there was
one or no template inside a folder.
Change-Id: I16faa2556ca02380bd4dac0d821ecac45b98b8c3
Reviewed-on: https://gerrit.libreoffice.org/1678
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sfx2/inc/sfx2/templatecontaineritem.hxx
b/sfx2/inc/sfx2/templatecontaineritem.hxx
index 2c2d18b..4768604 100644
--- a/sfx2/inc/sfx2/templatecontaineritem.hxx
+++ b/sfx2/inc/sfx2/templatecontaineritem.hxx
@@ -18,19 +18,26 @@ class TemplateContainerItem : public ThumbnailViewItem
public:
BitmapEx maPreview2;
+BitmapEx maPreview3;
+BitmapEx maPreview4;
std::vectorTemplateItemProperties maTemplates;
TemplateContainerItem (ThumbnailView rView);
virtual ~TemplateContainerItem ();
-const Point getPrev2Pos () const { return maPrev2Pos; }
-
virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor,
const ThumbnailItemAttributes *pAttrs);
+
+virtual void calculateItemsPosition (const long nThumbnailHeight, const
long nDisplayHeight,
+ const long nPadding, sal_uInt32
nMaxTextLenght,
+ const ThumbnailItemAttributes
*pAttrs);
+
+bool HasMissingPreview( );
+
private:
-Point maPrev2Pos;
+Rectangle maThumbnailArea;
};
#endif // TEMPLATEFOLDERVIEWITEM_HXX
diff --git a/sfx2/source/control/templateabstractview.cxx
b/sfx2/source/control/templateabstractview.cxx
index 182d833..de2091f 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -65,8 +65,10 @@ bool ViewFilter_Application::operator () (const
ThumbnailViewItem *pItem)
// Clear thumbnails
pContainerItem-maPreview1.Clear();
pContainerItem-maPreview2.Clear();
+pContainerItem-maPreview3.Clear();
+pContainerItem-maPreview4.Clear();
-for (size_t i = 0, n = rTemplates.size(); i n; ++i)
+for (size_t i = 0, n = rTemplates.size(); i n
pContainerItem-HasMissingPreview(); ++i)
{
if (isValid(rTemplates[i].aPath))
{
@@ -83,6 +85,18 @@ bool ViewFilter_Application::operator () (const
ThumbnailViewItem *pItem)
TEMPLATE_THUMBNAIL_MAX_WIDTH*0.75,
TEMPLATE_THUMBNAIL_MAX_HEIGHT*0.75);
}
+else if ( pContainerItem-maPreview3.IsEmpty() )
+{
+pContainerItem-maPreview3 =
TemplateAbstractView::scaleImg(rTemplates[i].aThumbnail,
+
TEMPLATE_THUMBNAIL_MAX_WIDTH*0.75,
+
TEMPLATE_THUMBNAIL_MAX_HEIGHT*0.75);
+}
+else if ( pContainerItem-maPreview4.IsEmpty() )
+{
+pContainerItem-maPreview4 =
TemplateAbstractView::scaleImg(rTemplates[i].aThumbnail,
+
TEMPLATE_THUMBNAIL_MAX_WIDTH*0.75,
+
TEMPLATE_THUMBNAIL_MAX_HEIGHT*0.75);
+}
}
}
diff --git a/sfx2/source/control/templatecontaineritem.cxx
b/sfx2/source/control/templatecontaineritem.cxx
index d63ce8a..25fa5fe 100644
--- a/sfx2/source/control/templatecontaineritem.cxx
+++ b/sfx2/source/control/templatecontaineritem.cxx
@@ -8,6 +8,7 @@
*/
#include sfx2/templatecontaineritem.hxx
+#include sfx2/templateabstractview.hxx
#include basegfx/matrix/b2dhommatrixtools.hxx
#include basegfx/polygon/b2dpolygon.hxx
@@ -35,11 +36,20 @@ TemplateContainerItem::~TemplateContainerItem ()
{
}
+void TemplateContainerItem::calculateItemsPosition (const long
nThumbnailHeight, const long nDisplayHeight,
+ const long nPadding, sal_uInt32
nMaxTextLenght,
+ const ThumbnailItemAttributes *pAttrs)
+{
+ThumbnailViewItem::calculateItemsPosition( nThumbnailHeight,
nDisplayHeight, nPadding, nMaxTextLenght, pAttrs);
+Point aPos
[PUSHED] Change in core[libreoffice-4-0]: Template Manager: removed All category
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1674 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1674 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I073b9601c82a464f705df30cfd7e760c212eb7ca Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0]: Template Manager: filter the results when opening the dialog
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1675 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1675 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If6cc5f6d5e502c1fc5da210179263be63fc8c8a6 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0]: Template Manager: show folders with 4 previews inside a roun...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1678 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1678 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I16faa2556ca02380bd4dac0d821ecac45b98b8c3 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sw/source
sw/source/core/crsr/pam.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit f39fa5aad48dc93bf24a328297635e5e46a65cff
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Jan 14 10:55:55 2013 +0100
fdo#57938 SwPaM::HasReadonlySel allow editing before commented text ranges
(cherry picked from commit 50b6dc0099ff61050b82a2e37e70d643151e7ce7)
Change-Id: I229602e7783c76e7fc57b78a408f90c1f6a8cda5
Reviewed-on: https://gerrit.libreoffice.org/1673
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 6d7f07a..e122212 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -699,6 +699,13 @@ sal_Bool SwPaM::HasReadonlySel( bool bFormView ) const
if (!bUnhandledMark)
bCommentrangeMark = pFieldmark-GetFieldname() ==
ODF_COMMENTRANGE;
}
+// Allow editing selection right before a commented range.
+if (!bCommentrangeMark GetMark())
+{
+pFieldmark = pMarksAccess-getFieldmarkFor(*GetMark());
+if (pFieldmark)
+bCommentrangeMark = pFieldmark-GetFieldname() ==
ODF_COMMENTRANGE;
+}
}
if (!bRet)
@@ -707,7 +714,7 @@ sal_Bool SwPaM::HasReadonlySel( bool bFormView ) const
if ( ( pA == pB ) bUnhandledMark )
bRet = sal_True;
// Allow editing of commented ranges.
-else if (!((pA == pB) bCommentrangeMark))
+else if (!bCommentrangeMark)
{
// Form protection case
bool bAtStartA = pA != NULL pA-GetMarkStart() == *GetPoint();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - scripting/source
scripting/source/pyprov/mailmerge.py | 25 +
1 file changed, 17 insertions(+), 8 deletions(-)
New commits:
commit e523186e59632ef824eb3262edd0c63e388af6e8
Author: Michael Stahl mst...@redhat.com
Date: Mon Jan 14 12:37:29 2013 +0100
fdo#59249: mailmerge.py: adapt to changes in smtplib:
Apparently the login() method in Python 3.3 expects str arguments for
user and password, since it calls encode on them, but for Python 2.6 the
encode calls were explicitly added in the caller since login() does
not encode itself; add an ugly version check for that.
Change-Id: Iebfce44073a837e9cb845855ba448d5b6a2ebd11
(cherry picked from commit 1a5b3d8e4d88aa27647cc7b99623dd6f6e706bbc)
Reviewed-on: https://gerrit.libreoffice.org/1669
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/scripting/source/pyprov/mailmerge.py
b/scripting/source/pyprov/mailmerge.py
index d76322e..c606143 100755
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -99,9 +99,12 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
self.server.starttls()
self.server.ehlo()
- user = xAuthenticator.getUserName().encode('ascii')
- password = xAuthenticator.getPassword().encode('ascii')
- if user != b'':
+ user = xAuthenticator.getUserName()
+ password = xAuthenticator.getPassword()
+ if user != '':
+ if sys.version '3': # fdo#59249 i#105669 Python 2
needs ascii
+ user = user.encode('ascii')
+ password = password.encode('ascii')
if dbg:
print(Logging in, username of + user,
file=dbgout)
self.server.login(user, password)
@@ -279,9 +282,12 @@ class PyMailIMAPService(unohelper.Base, XMailService):
self.server = imaplib.IMAP4(server, port)
print(AFTER, file=dbgout)
- user = xAuthenticator.getUserName().encode('ascii')
- password = xAuthenticator.getPassword().encode('ascii')
- if user != b'':
+ user = xAuthenticator.getUserName()
+ password = xAuthenticator.getPassword()
+ if user != '':
+ if sys.version '3': # fdo#59249 i#105669 Python 2
needs ascii
+ user = user.encode('ascii')
+ password = password.encode('ascii')
if dbg:
print(Logging in, username of + user,
file=dbgout)
self.server.login(user, password)
@@ -348,8 +354,11 @@ class PyMailPOP3Service(unohelper.Base, XMailService):
self.server = poplib.POP3(server, port)
print(AFTER, file=dbgout)
- user = xAuthenticator.getUserName().encode('ascii')
- password = xAuthenticator.getPassword().encode('ascii')
+ user = xAuthenticator.getUserName()
+ password = xAuthenticator.getPassword()
+ if sys.version '3': # fdo#59249 i#105669 Python 2 needs
ascii
+ user = user.encode('ascii')
+ password = password.encode('ascii')
if dbg:
print(Logging in, username of + user, file=dbgout)
self.server.user(user)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-4-0]: fdo#57938 SwPaM::HasReadonlySel allow editing before comment...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1673 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1673 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I229602e7783c76e7fc57b78a408f90c1f6a8cda5 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0]: fdo#59249: mailmerge.py: adapt to changes in smtplib:
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1669 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1669 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iebfce44073a837e9cb845855ba448d5b6a2ebd11 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c5192576bfe0d61302cc2fcbf870e8ec6d870d8e Author: Michael Stahl mst...@redhat.com Date: Mon Jan 14 19:38:19 2013 +0100 Updated core Project: help 89d2680dda47ae81b2a50a0e9e1239f90b99cdb7 diff --git a/helpcontent2 b/helpcontent2 index d5d84f0..89d2680 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d5d84f0ec4584e32147eeab355d0ab73e7dd9172 +Subproject commit 89d2680dda47ae81b2a50a0e9e1239f90b99cdb7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: source/text
source/text/shared/autopi/01130100.xhp | 14 ++ 1 file changed, 2 insertions(+), 12 deletions(-) New commits: commit 89d2680dda47ae81b2a50a0e9e1239f90b99cdb7 Author: Michael Stahl mst...@redhat.com Date: Mon Jan 14 19:38:19 2013 +0100 help: Document Converter: remove obsolete StarOffice format documentation The legacy StarOffice formats cannot be converted in 4.0 anyway because binfilter has been removed. Change-Id: I937ab2946b33eba0e1c603ab9659bfec86862155 diff --git a/source/text/shared/autopi/01130100.xhp b/source/text/shared/autopi/01130100.xhp index 4f57d4d..f400719 100644 --- a/source/text/shared/autopi/01130100.xhp +++ b/source/text/shared/autopi/01130100.xhp @@ -21,7 +21,7 @@ -- - helpdocument version=1.0 +helpdocument version=1.0 meta topic id=textsharedautopi01130100xml indexer=include status=PUBLISH title id=tit xml-lang=en-USDocument Converter Page 1/title @@ -31,21 +31,11 @@ body section id=seite1 paragraph role=heading id=hd_id3151299 xml-lang=en-US level=1 l10n=U oldref=1link href=text/shared/autopi/01130100.xhp name=Document Converter Page 1Document Converter Page 1/link/paragraph -paragraph role=paragraph id=par_id3150445 xml-lang=en-US l10n=U oldref=2Specifies whether to convert documents from $[officename] or Microsoft Office, and specifies the document type./paragraph +paragraph role=paragraph id=par_id3150445 xml-lang=en-US l10n=U oldref=2Specifies the type of Microsoft Office documents that will be converted./paragraph /section section id=howtoget embed href=text/shared/00/0401.xhp#autopilotmsimport1/ /section -bookmark xml-lang=en-US branch=hid/WIZARDS_HID_DLGIMPORT_0_OPTSODOCUMENTS id=bm_id3150808 localize=false/paragraph role=heading id=hd_id3155364 xml-lang=en-US level=2 l10n=U oldref=27$[officename]/paragraph -paragraph role=paragraph id=par_id3149205 xml-lang=en-US l10n=CHG oldref=28ahelp hid=HID_DLGIMPORT_0_OPTSODOCUMENTSConverts old binary documents into the OpenDocument format used by $[officename]./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/WIZARDS_HID_DLGIMPORT_0_CHKWRITER id=bm_id3153394 localize=false/paragraph role=heading id=hd_id3153049 xml-lang=en-US level=3 l10n=U oldref=29Text documents/paragraph -paragraph role=paragraph id=par_id3145669 xml-lang=en-US l10n=CHG oldref=30ahelp hid=HID_DLGIMPORT_0_CHKWRITERConverts documents in the old format of Writer *.sdw into OpenDocument *.odt documents./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/WIZARDS_HID_DLGIMPORT_0_CHKCALC id=bm_id3149095 localize=false/paragraph role=heading id=hd_id3151226 xml-lang=en-US level=3 l10n=U oldref=31Spreadsheets/paragraph -paragraph role=paragraph id=par_id3155391 xml-lang=en-US l10n=CHG oldref=32ahelp hid=HID_DLGIMPORT_0_CHKCALCConverts documents in the old format of Calc *.sdc into OpenDocument *.ods documents./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/WIZARDS_HID_DLGIMPORT_0_CHKIMPRESS id=bm_id3153683 localize=false/paragraph role=heading id=hd_id3145211 xml-lang=en-US level=3 l10n=U oldref=33Drawing/presentation documents/paragraph -paragraph role=paragraph id=par_id3154289 xml-lang=en-US l10n=CHG oldref=34ahelp hid=HID_DLGIMPORT_0_CHKIMPRESSConverts documents in the old format of Draw *.sda into OpenDocument *.odg documents, and Impress *.sdd into OpenDocument *.odp documents./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/WIZARDS_HID_DLGIMPORT_0_CHKMATHGLOBAL id=bm_id3156346 localize=false/paragraph role=heading id=hd_id3143267 xml-lang=en-US level=3 l10n=U oldref=35Master documents/formulas/paragraph -paragraph role=paragraph id=par_id3156114 xml-lang=en-US l10n=CHG oldref=36ahelp hid=HID_DLGIMPORT_0_CHKMATHGLOBALConverts documents in the old format of Writer master documents *.sgl into OpenDocument *.odm documents, and Math *.smf into OpenDocument *.odf documents./ahelp/paragraph bookmark xml-lang=en-US branch=hid/WIZARDS_HID_DLGIMPORT_0_OPTMSDOCUMENTS id=bm_id3147209 localize=false/paragraph role=heading id=hd_id3166410 xml-lang=en-US level=2 l10n=U oldref=37Microsoft Office/paragraph paragraph role=paragraph id=par_id3150771 xml-lang=en-US l10n=CHG oldref=38Converts Microsoft Office documents into the OpenDocument format./paragraph bookmark xml-lang=en-US branch=hid/WIZARDS_HID_DLGIMPORT_2_CHKWORD id=bm_id3148685 localize=false/paragraph role=heading id=hd_id3150984 xml-lang=en-US level=3 l10n=U oldref=3Word documents/paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - scripting/source wizards/source
scripting/source/pyprov/mailmerge.py |6 - wizards/source/importwizard/API.xba | 11 - wizards/source/importwizard/DialogModul.xba | 157 +-- wizards/source/importwizard/FilesModul.xba | 10 - wizards/source/importwizard/ImportDialog.xdl | 15 -- wizards/source/importwizard/Language.xba | 19 --- wizards/source/importwizard/Main.xba | 45 --- wizards/source/importwizard/importwi.src | 123 - 8 files changed, 17 insertions(+), 369 deletions(-) New commits: commit 8bab53a19828b888ca689dafaf98aa3ba82228a8 Author: Michael Stahl mst...@redhat.com Date: Mon Jan 14 19:58:02 2013 +0100 wizards: Document Conversion: remove StarOffice mode: With the removal of binfilter, legacy StarOffice format documents cannot be converted any more, so remove the associated code. Change-Id: I49da6b56eb893acebce0de43846128abaede6a71 diff --git a/wizards/source/importwizard/API.xba b/wizards/source/importwizard/API.xba index 192dc2c..c62e887 100644 --- a/wizards/source/importwizard/API.xba +++ b/wizards/source/importwizard/API.xba @@ -102,8 +102,6 @@ Dim Index as Integer sPath = SOWorkPath End If GetDefaultPath = sPath - Case SBXMLMODE - GetDefaultPath = SOWorkPath End Select End Function @@ -158,13 +156,6 @@ Dim sTemplateValueName as String Else GetTemplateDefaultPath = SOWorkPath End If - Case SBXMLMODE - If Index = 3 Then - apos; Helper Application with no templates - GetTemplateDefaultPath = SOWorkPath - Else - GetTemplateDefaultPath = SOTemplatePath - End If End Select NOVALIDSYSTEMPATH: If Err lt;gt; 0 Then @@ -222,4 +213,4 @@ Dim vValue As Stringapos; Key value RegCloseKeyA (hKey) QueryValue = vValue End Function -/script:module \ No newline at end of file +/script:module diff --git a/wizards/source/importwizard/DialogModul.xba b/wizards/source/importwizard/DialogModul.xba index 70f9a6b..a9ea8f9 100644 --- a/wizards/source/importwizard/DialogModul.xba +++ b/wizards/source/importwizard/DialogModul.xba @@ -27,10 +27,9 @@ Public Const SBTHIRDAPPLCHECKED = 2 Public Const SBFOURTHAPPLCHECKED = 3 Public WizardMode as String Public Const SBMICROSOFTMODE = quot;MSquot; -Public Const SBXMLMODE = quot;SOquot; apos; The absolute maximal Number of possible Applications -Public Const Twip = 425 Public Const SBMAXAPPLCOUNT = 4 +Public Const Twip = 425 Public MaxApplCount as Integer Public CurOffice As Integer Public SOBitmapPath As String @@ -47,12 +46,6 @@ Public sKeyName(SBMAXAPPLCOUNT-1) as String Public sValueName(SBMAXAPPLCOUNT-1) as String Public sCRLF as String Public MSFilterName(5,4) as String -Public XMLFilterName(7,3) as String apos;Number of different formats - -apos; e.g.: -apos; XMLFilterName(x,0) = quot;sdwquot; apos; in documents we take the extensions; in SO-templates the appropriate Filtername -apos; XMLFilterName(x,1) = quot;swriter: StarWriter 5.0quot;apos; the filtername of the target-format -apos; XMLFilterName(x,2) = quot;sxwquot; apos; the target extension Public Applications(SBMAXAPPLCOUNT-1,9) @@ -101,11 +94,6 @@ Dim i as Integer .chkMSApplication2.Label = sMsDocumentCheckbox(1) .chkMSApplication3.Label = sMsDocumentCheckbox(2) - .optSODocuments.Label = sContainerName(1) - .chkSOApplication1.Label = sSODocumentCheckbox(0) - .chkSOApplication2.Label = sSODocumentCheckbox(1) - .chkSOApplication3.Label = sSODocumentCheckbox(2) - .chkSOApplication4.Label = sSODocumentCheckbox(3) .cmdBack.Enabled = False .Step = 1 @@ -126,7 +114,7 @@ Dim oNullObject as Object If ImportDialog.optMSDocuments.State = 1 Then SetupMSConfiguration() Else - SetupXMLConfiguration() + apos;Not supposed to happen - is there an assert in BASIC... End If FillUpApplicationList() End If @@ -140,25 +128,14 @@ Dim oNullObject as Object .txtDocumentImportPath.Text = ConvertFromUrl(Applications(CurOffice,SBDOCSOURCE)) .txtDocumentExportPath.Text = ConvertFromUrl(Applications(CurOffice,SBDOCTARGET)) .hlnDocuments.Label = sProgressMoreDocs - If WizardMode = SBXMLMODE Then - ImportDialogArea.Title = sTitle amp; quot; - quot; amp;
Re: [master] installer issue in Windows
Hi Michael Le Mon, 14 Jan 2013 11:15:50 +0100, Michael Meeks michael.me...@suse.com a écrit: Hi Mat, On Sun, 2013-01-13 at 01:53 +0100, Mat M wrote: Trying to build from 484bb96aa975, I got an error when doing install sets. Here is the short error message from instsetoo_native: Ah - that is annoying. This means that your setup_osl.bin that should be in the solver/ mentions these things but they have not been built. Perhaps you changed your configure options after building 'scp2' ? try: make scp2.clean make scp2 make scp2.deliver or somesuch. Failing that - manually hack the setup_osl.bin to remove these files (the references to them don't matter so much though). You're nearly there :-) Actually, I was missing a --disable-activex-scripting configure flag, which was unknown to me and I found it by git grepping activex when digging in the code. Thanks for your pointers anyway, it could help in the future :) Regards -- Mat M ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Need confirmation about non-clearing of Character Styles
Hi all, Sorry fr being late here... Michael Stahl wrote (10-01-13 15:10) My understanding is a) that its intentional, see http://lists.freedesktop.org/archives/ooo-build/2010-February/000540.html and the commit http://cgit.freedesktop.org/libreoffice/core/commit/?id=6e690e0909459d46c53d17e7939891abea11e566 the corresponding issues are an interesting read: https://issues.apache.org/ooo/show_bug.cgi?id=47893 - patch author arguing for the change https://issues.apache.org/ooo/show_bug.cgi?id=85464 - a certain Cor reporting the change as regression :) Depends on what users expect and what has been communicated about new features ;-) i definitely think that there should be some button to reset formatting that leaves character styles intact, and that should be the most easily accessible option. As mentioned by others: this is how this works. And is the most used. Often just to control a piece of the documents content (cleaning up rubbish). but i wouldn't object to a second button to reset all formatting, including styles. This is a second option, used far less, and should be as easy as Copy Paste special as Text without formatting. resetting the character styles should be as easy as setting Default char style on the whole document, so i'm not sure if another option is worth the additional clutter. This is a third option... Selecting a piece of text and hitting Ctrl-Shift-M (extended from Ctrl-M) would be far more easy then F11, using mouse to activate Character styles, Select/apply Default.. (Should be an easy hack, with all old changes available to look at?) but hyperlinks should not be touched by any reset formatting since they are not formatting, but content entities (the reset feature also doesn't convert fields to plain text). also i'm thinking that ruby text should also not be touched by reset formatting, and this has not yet been changed (i.e. it is reset currently); the reset will actually throw away the ruby text. i'm already sitting on a patch to remove ruby from the reset list... I do not disagree on these points. Cheers, Cor -- - Cor - http://nl.libreoffice.org - www.librelex.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/qa sfx2/inc sfx2/source
sc/qa/unit/ucalc.cxx| 97 +++-
sfx2/inc/sfx2/objsh.hxx |6 ++
sfx2/source/doc/objstor.cxx |6 ++
3 files changed, 98 insertions(+), 11 deletions(-)
New commits:
commit 1712337d4dbdca7453a8ff701d429637edb9934b
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Jan 14 15:08:22 2013 -0500
Add new unit test to test pivot table functionalities via ScDBDocFunc.
This change also introduces the following changes:
1) Special initialization routine just for the unit test runs. In
particular, SfxMedium instance needs to be set even for a brand-new
document (as in the actual run-time), or else the document would be
always labeled read-only. This prevented us from testing various
code in Calc, which this commit fixes.
2) Several cppunit checks that checked for incorrect results, which
passed because we happened to be getting those incorrect results
due to the issue with the SfxMedium instance not being set.
3) Unfortunately now the test for cell function MATCH fails for some
mysterious reason. The test is disabled temporarily until we figure
this out.
Change-Id: If231fd99e0ffddcd74f65c7cb5476e7a25f0ac7d
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 2d736de..6e52d6e 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -204,6 +204,11 @@ public:
*/
void testPivotTableFieldReference();
+/**
+ * Test pivot table functionality performed via ScDBDocFunc.
+ */
+void testPivotTableDocFunc();
+
void testSheetCopy();
void testSheetMove();
void testExternalRef();
@@ -287,6 +292,7 @@ public:
CPPUNIT_TEST(testPivotTableCaseInsensitiveStrings);
CPPUNIT_TEST(testPivotTableNumStability);
CPPUNIT_TEST(testPivotTableFieldReference);
+CPPUNIT_TEST(testPivotTableDocFunc);
CPPUNIT_TEST(testSheetCopy);
CPPUNIT_TEST(testSheetMove);
CPPUNIT_TEST(testExternalRef);
@@ -422,6 +428,7 @@ void Test::setUp()
SFXMODEL_DISABLE_EMBEDDED_SCRIPTS |
SFXMODEL_DISABLE_DOCUMENT_RECOVERY);
+m_xDocShRef-DoInitUnitTest();
m_pDoc = m_xDocShRef-GetDocument();
}
@@ -1138,7 +1145,7 @@ void Test::testCellFunctions()
testFuncCOUNTIF(m_pDoc);
testFuncIFERROR(m_pDoc);
testFuncVLOOKUP(m_pDoc);
-testFuncMATCH(m_pDoc);
+// testFuncMATCH(m_pDoc); // TODO: Fix this and re-enable it.
testFuncCELL(m_pDoc);
testFuncDATEDIF(m_pDoc);
testFuncINDIRECT(m_pDoc);
@@ -1410,9 +1417,7 @@ void Test::testNamedRange()
{ MyRange3, $Sheet1.$C$1:$C$100, 4 }
};
-rtl::OUString aTabName(Sheet1);
-CPPUNIT_ASSERT_MESSAGE (failed to insert sheet,
-m_pDoc-InsertTab (0, aTabName));
+CPPUNIT_ASSERT_MESSAGE (failed to insert sheet, m_pDoc-InsertTab (0,
Sheet1));
m_pDoc-SetValue (0, 0, 0, 101);
@@ -3651,10 +3656,78 @@ void Test::testPivotTableFieldReference()
m_pDoc-DeleteTab(0);
}
+void Test::testPivotTableDocFunc()
+{
+m_pDoc-InsertTab(0, OUString(Data));
+m_pDoc-InsertTab(1, OUString(Table));
+
+// Raw data
+const char* aData[][2] = {
+{ Name, Value },
+{ Sun, 1 },
+{ Oracle,2 },
+{ Red Hat, 4 },
+{ SUSE, 8 },
+{ Apple, 16 },
+{ Microsoft, 32 },
+};
+
+// Dimension definition
+DPFieldDef aFields[] = {
+{ Name, sheet::DataPilotFieldOrientation_ROW, 0 },
+{ Value, sheet::DataPilotFieldOrientation_DATA,
sheet::GeneralFunction_SUM },
+};
+
+ScAddress aPos(1,1,0);
+ScRange aDataRange = insertRangeData(m_pDoc, aPos, aData,
SAL_N_ELEMENTS(aData));
+CPPUNIT_ASSERT_MESSAGE(failed to insert range data at correct position,
aDataRange.aStart == aPos);
+
+ScDPObject* pDPObj = createDPFromRange(
+m_pDoc, aDataRange, aFields, SAL_N_ELEMENTS(aFields), false);
+
+CPPUNIT_ASSERT_MESSAGE(Failed to create pivot table object., pDPObj);
+
+// Craete a new pivot table output.
+ScDBDocFunc aFunc(*m_xDocShRef);
+bool bSuccess = aFunc.CreatePivotTable(*pDPObj, false, true);
+CPPUNIT_ASSERT_MESSAGE(Failed to create pivot table output via
ScDBDocFunc., bSuccess);
+ScDPCollection* pDPs = m_pDoc-GetDPCollection();
+CPPUNIT_ASSERT_MESSAGE(Failed to get pivot table collection., pDPs);
+CPPUNIT_ASSERT_EQUAL(static_castsize_t(1), pDPs-GetCount());
+pDPObj = (*pDPs)[0];
+CPPUNIT_ASSERT_MESSAGE(Failed to retrieve pivot table object from the
collection, pDPObj);
+ScRange aOutRange = pDPObj-GetOutRange();
+{
+// Expected output table content. 0 = empty cell
+const char* aOutputCheck[][2] = {
+{ Name, 0 },
+{ Apple, 16 },
+{ Microsoft, 32 },
+{ Oracle, 2 },
+{ Red Hat, 4 },
+{ Sun, 1 },
+{ SUSE, 8 },
+
[Libreoffice-commits] .: sc/CppunitTest_sc_ucalc.mk sc/qa
sc/CppunitTest_sc_ucalc.mk |2 ++ sc/qa/unit/ucalc.cxx |2 +- 2 files changed, 3 insertions(+), 1 deletion(-) New commits: commit 230072a6be455c45ec37229caa97563e08f7d7b4 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Mon Jan 14 16:06:24 2013 -0500 Figured out why testFuncMATCH was failing. Fixed it, all green. Change-Id: Id45f4c853bf689afa8a46edc02e1e5f8c43894bc diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index 3151f14..28bf1bc 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -95,8 +95,10 @@ $(eval $(call gb_CppunitTest_use_ure,sc_ucalc)) $(eval $(call gb_CppunitTest_use_components,sc_ucalc,\ configmgr/source/configmgr \ +fileaccess/source/fileacc \ framework/util/fwk \ i18npool/util/i18npool \ +sax/source/expatwrap/expwrap \ sfx2/util/sfx \ ucb/source/core/ucb1 \ ucb/source/ucp/file/ucpfile1 \ diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 6e52d6e..2b66195 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -1145,7 +1145,7 @@ void Test::testCellFunctions() testFuncCOUNTIF(m_pDoc); testFuncIFERROR(m_pDoc); testFuncVLOOKUP(m_pDoc); -// testFuncMATCH(m_pDoc); // TODO: Fix this and re-enable it. +testFuncMATCH(m_pDoc); testFuncCELL(m_pDoc); testFuncDATEDIF(m_pDoc); testFuncINDIRECT(m_pDoc); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/qa
sc/qa/unit/ucalc.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 25f5a30c85f960dfdfe918531f9c788fe307cb2f
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Jan 14 16:08:39 2013 -0500
Keep this simple. No need to wrap literals with OUString any more.
Change-Id: Idedd6be54cf74efc69a48d39018011aba018973e
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 2b66195..9e116c3 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -3658,8 +3658,8 @@ void Test::testPivotTableFieldReference()
void Test::testPivotTableDocFunc()
{
-m_pDoc-InsertTab(0, OUString(Data));
-m_pDoc-InsertTab(1, OUString(Table));
+m_pDoc-InsertTab(0, Data);
+m_pDoc-InsertTab(1, Table);
// Raw data
const char* aData[][2] = {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/uiconfig
sw/uiconfig/swriter/ui/inserttable.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9ad64e2c8c9e8b192bb97fcf0ef40061ec379f40 Author: Andras Timar ati...@suse.com Date: Mon Jan 14 22:12:03 2013 +0100 fdo#58854 'Insert' button was untranslatable Change-Id: Iedb17e216083fdb8990fe9dc663b27eaa352ecf3 diff --git a/sw/uiconfig/swriter/ui/inserttable.ui b/sw/uiconfig/swriter/ui/inserttable.ui index 9cf3cdc..b05a053 100644 --- a/sw/uiconfig/swriter/ui/inserttable.ui +++ b/sw/uiconfig/swriter/ui/inserttable.ui @@ -42,7 +42,7 @@ /child child object class=GtkButton id=ok -property name=labelInsert/property +property name=label translatable=yesInsert/property property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
