[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - solenv/bin
solenv/bin/modules/installer/ziplist.pm | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit f5c25c54d38e06e8fb5f36be043b9316da036bf9
Author: Andras Timar
Date: Wed Apr 3 23:43:13 2013 -0700
For Intel AppUp build hide the links in start center
Change-Id: I74e6757741ba9d8c8c494018e4bf3e4f638aa3f6
diff --git a/solenv/bin/modules/installer/ziplist.pm
b/solenv/bin/modules/installer/ziplist.pm
index c052e72..66c0688 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -104,6 +104,7 @@ sub read_ziplist {
set_default_productversion_if_required($allvariableshashref);
add_variables_to_allvariableshashref($allvariableshashref);
overwrite_branding( $allvariableshashref );
+startcenter_links_hide_or_not( $allvariableshashref );
return $allsettingsarrayref, $allvariableshashref;
}
@@ -833,6 +834,16 @@ sub overwrite_branding
}
###
+# For Intel AppUp build hide the links in start center
+###
+sub startcenter_links_hide_or_not
+{
+my ($variableshashref) = @_;
+$variableshashref->{'STARTCENTER_HIDE_EXTERNAL_LINKS'} = "1" , if( defined
$ENV{'ENABLE_SILENT_MSI'} && $ENV{'ENABLE_SILENT_MSI'} eq "TRUE" );
+}
+
+
+###
# Adding the lowercase variables into the variableshashref
###
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/bastyp/helper.cxx | 12
1 file changed, 12 deletions(-)
New commits:
commit f935aa9d9cb6dde3dfd1b018c4b8938ff6c16183
Author: Tor Lillqvist
Date: Thu Apr 4 08:25:08 2013 +0300
WaE: unused function 'convertDateTime'
Change-Id: I6d36291f4381cc43782861ca1180b7fa7b11
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index 444dda9..434d7a8 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -56,18 +56,6 @@ using ::std::vector;
using ::rtl::OStringToOUString;
-namespace {
-
-DateTime convertDateTime( const util::DateTime& rUnoDT )
-{
-return DateTime( Date( rUnoDT.Day, rUnoDT.Month, rUnoDT.Year ),
- Time( rUnoDT.Hours, rUnoDT.Minutes, rUnoDT.Seconds,
rUnoDT.HundredthSeconds ) );
-}
-
-}
-
-// ---
-
std::vector SfxContentHelper::GetResultSet( const OUString& rURL )
{
vector aList;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/outdev3.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5551702b8dc3e9d06510ea7d12e6a25f35468a93
Author: Tor Lillqvist
Date: Thu Apr 4 08:13:44 2013 +0300
WaE: variable is uninitialized when used within its own initialization
Presumably aStr is intended here, not aTmpStr itself.
Change-Id: I9a887c33f89d519c17ee0156ba9cea55b465fe97
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 353a3be..0413cc0 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -6688,7 +6688,7 @@ OUString OutputDevice::ImplGetEllipsisString( const
OutputDevice& rTargetDevice,
}
else if ( nStyle & TEXT_DRAW_ENDELLIPSIS )
{
-OUString aTmpStr = aStr.replaceAt( nIndex,
aTmpStr.getLength()-nIndex, "" );
+OUString aTmpStr = aStr.replaceAt( nIndex,
aStr.getLength()-nIndex, "" );
if ( nIndex > 1 )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/inc svx/source
svx/inc/svx/svdedxv.hxx|2 -
svx/source/svdraw/svdedxv.cxx | 44 ++---
svx/source/svdraw/svdetc.cxx |2 -
svx/source/svdraw/svdhdl.cxx | 10
svx/source/svdraw/svdibrow.cxx | 18 +++
svx/source/svdraw/svdlayer.cxx |2 -
svx/source/svdraw/svdmodel.cxx |2 -
svx/source/svdraw/svdmrkv.cxx | 48 -
8 files changed, 64 insertions(+), 64 deletions(-)
New commits:
commit 690b40af2d1e38e8a836b4c64b3fa3082fbac536
Author: Takeshi Abe
Date: Thu Apr 4 12:25:07 2013 +0900
sal_Bool to bool
Change-Id: I4f8a592404272f3ba2602aa1ef42d399d7faae78
diff --git a/svx/inc/svx/svdedxv.hxx b/svx/inc/svx/svdedxv.hxx
index b385aef..13cf6f0 100644
--- a/svx/inc/svx/svdedxv.hxx
+++ b/svx/inc/svx/svdedxv.hxx
@@ -117,7 +117,7 @@ protected:
// Eine neue OutlinerView auf dem Heap anlegen und alle erforderlichen
Parameter setzen.
// pTextEditObj, pTextEditPV und pTextEditOutliner muessen initiallisiert
sein.
-OutlinerView* ImpMakeOutlinerView(Window* pWin, sal_Bool bNoPaint,
OutlinerView* pGivenView) const;
+OutlinerView* ImpMakeOutlinerView(Window* pWin, bool bNoPaint,
OutlinerView* pGivenView) const;
void ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectangle& rRect,
OutputDevice& rTargetDevice) const;
void ImpInvalidateOutlinerView(OutlinerView& rOutlView) const;
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 06c3640..f671510 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -172,9 +172,9 @@ void SdrObjEditView::ModelHasChanged()
SdrTextObj* pTextObj=dynamic_cast( mxTextEditObj.get() );
if (pTextObj!=NULL) {
sal_uIntPtr nOutlViewAnz=pTextEditOutliner->GetViewCount();
-sal_Bool bAreaChg=sal_False;
-sal_Bool bAnchorChg=sal_False;
-sal_Bool bColorChg=sal_False;
+bool bAreaChg=false;
+bool bAnchorChg=false;
+bool bColorChg=false;
bool bContourFrame=pTextObj->IsContourTextFrame();
EVAnchorMode eNewAnchor(ANCHOR_VCENTER_HCENTER);
Rectangle aOldArea(aMinTextEditArea);
@@ -228,7 +228,7 @@ void SdrObjEditView::ModelHasChanged()
if (nStat!=nStat0) pOLV->SetControlWord(nStat);
}
pTextEditOutliner->SetUpdateMode(sal_True);
-bAreaChg=sal_True;
+bAreaChg=true;
}
}
if (pTextEditOutlinerView!=NULL) { // check fill and anchor
@@ -433,13 +433,13 @@ void
SdrObjEditView::ImpInvalidateOutlinerView(OutlinerView& rOutlView) const
}
}
-OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, sal_Bool
/*bNoPaint*/, OutlinerView* pGivenView) const
+OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, bool
/*bNoPaint*/, OutlinerView* pGivenView) const
{
// background
Color aBackground(GetTextEditBackgroundColor(*this));
SdrTextObj* pText = dynamic_cast< SdrTextObj * >( mxTextEditObj.get() );
-sal_Bool bTextFrame=pText!=NULL && pText->IsTextFrame();
-sal_Bool bContourFrame=pText!=NULL && pText->IsContourTextFrame();
+bool bTextFrame=pText!=NULL && pText->IsTextFrame();
+bool bContourFrame=pText!=NULL && pText->IsContourTextFrame();
// create OutlinerView
OutlinerView* pOutlView=pGivenView;
pTextEditOutliner->SetUpdateMode(sal_False);
@@ -540,12 +540,12 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
bTextEditNewObj=bIsNewObj;
const sal_uInt32 nWinAnz(PaintWindowCount());
sal_uInt32 i;
-sal_Bool bBrk(sal_False);
+bool bBrk(false);
// break, when no object given
if(!pObj)
{
-bBrk = sal_True;
+bBrk = true;
}
if(!bBrk && !pWin)
@@ -563,7 +563,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
// break, when no window exists
if(!pWin)
{
-bBrk = sal_True;
+bBrk = true;
}
}
@@ -574,7 +574,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
// break, when no PageView for the object exists
if(!pPV)
{
-bBrk = sal_True;
+bBrk = true;
}
}
@@ -583,7 +583,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
// no TextEdit on objects in locked Layer
if(pPV->GetLockedLayers().IsSet(pObj->GetLayer()))
{
-bBrk = sal_True;
+bBrk = true;
}
}
@@ -608,7 +608,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
pTextEditOutliner->ForceAutoColor(
aOptions.GetIsAutomaticFontColor() );
}
-sal_Bool bEmpty = mxTextEditObj->GetOutlinerParaObject()==NULL;
+bool bEmpty = mxTextEditObj->GetOutlinerParaObject()==NULL;
aOldCalcFieldValueLink=pTextEditOutliner->GetCalcFieldValueHdl();
[PATCH] Replace `compareTo(...) == 0` with ==
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3198
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/98/3198/1
Replace `compareTo(...) == 0` with ==
Change-Id: Ib83a9051ea12c53642f781e5427a6ca728049a7f
---
M comphelper/inc/comphelper/property.hxx
M comphelper/source/misc/ihwrapnofilter.cxx
M comphelper/source/misc/instancelocker.cxx
M dbaccess/source/ui/dlg/CollectionView.cxx
M desktop/source/deployment/manager/dp_informationprovider.cxx
M dtrans/source/cnttype/mcnttfactory.cxx
M dtrans/source/generic/clipboardmanager.cxx
M dtrans/source/generic/generic_clipboard.cxx
M dtrans/source/win32/clipb/WinClipboard.cxx
M dtrans/source/win32/ftransl/ftransl.cxx
M embeddedobj/source/commonembedding/xfactory.cxx
M embeddedobj/source/general/xcreator.cxx
M embeddedobj/source/msole/xdialogcreator.cxx
M embeddedobj/source/msole/xolefactory.cxx
M embeddedobj/test/MainThreadExecutor/xexecutor.cxx
M embeddedobj/test/mtexecutor/bitmapcreator.cxx
M embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
M forms/source/component/Edit.cxx
M fpicker/source/aqua/SalAquaFilePicker.mm
M fpicker/source/aqua/SalAquaFolderPicker.mm
M fpicker/source/win32/filepicker/FilePicker.cxx
M fpicker/source/win32/filepicker/VistaFilePicker.cxx
M fpicker/source/win32/folderpicker/FolderPicker.cxx
23 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/comphelper/inc/comphelper/property.hxx
b/comphelper/inc/comphelper/property.hxx
index d8e0d3b..29ff7b2 100644
--- a/comphelper/inc/comphelper/property.hxx
+++ b/comphelper/inc/comphelper/property.hxx
@@ -60,12 +60,12 @@
//
inline bool operator()( const ::com::sun::star::beans::Property& lhs,
const ::rtl::OUString& rhs ) const
{
-return lhs.Name.compareTo(rhs) == 0;
+return lhs.Name == rhs ;
}
//
inline bool operator()( const ::rtl::OUString& lhs, const
::com::sun::star::beans::Property& rhs ) const
{
-return lhs.compareTo(rhs.Name) == 0;
+return lhs == rhs.Name ;
}
};
//--
@@ -74,7 +74,7 @@
{
bool operator() (const ::com::sun::star::beans::Property& x, const
::com::sun::star::beans::Property& y) const
{
-return x.Name.compareTo(y.Name) == 0;
+return x.Name == y.Name ;
}
};
diff --git a/comphelper/source/misc/ihwrapnofilter.cxx
b/comphelper/source/misc/ihwrapnofilter.cxx
index 150da2b..c6b6697 100644
--- a/comphelper/source/misc/ihwrapnofilter.cxx
+++ b/comphelper/source/misc/ihwrapnofilter.cxx
@@ -114,7 +114,7 @@
uno::Sequence< ::rtl::OUString > aSeq =
impl_staticGetSupportedServiceNames();
for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ )
-if ( ServiceName.compareTo( aSeq[nInd] ) == 0 )
+if ( ServiceName == aSeq[nInd] )
return sal_True;
return sal_False;
diff --git a/comphelper/source/misc/instancelocker.cxx
b/comphelper/source/misc/instancelocker.cxx
index 50ca694..a42852f 100644
--- a/comphelper/source/misc/instancelocker.cxx
+++ b/comphelper/source/misc/instancelocker.cxx
@@ -203,7 +203,7 @@
uno::Sequence< ::rtl::OUString > aSeq = getSupportedServiceNames();
for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ )
-if ( ServiceName.compareTo( aSeq[nInd] ) == 0 )
+if ( ServiceName == aSeq[nInd] )
return sal_True;
return sal_False;
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx
b/dbaccess/source/ui/dlg/CollectionView.cxx
index 40516da..202c54f 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -287,7 +287,7 @@
const ::rtl::OUString sCID =
m_xContent->getIdentifier()->getContentIdentifier();
const static ::rtl::OUString s_sFormsCID("private:forms");
const static ::rtl::OUString s_sReportsCID("private:reports");
-m_bCreateForm = s_sFormsCID.compareTo(sCID) == 0;
+m_bCreateForm = s_sFormsCID == sCID ;
::rtl::OUString sPath("/");
if ( m_bCreateForm && sCID.getLength() != s_sFormsCID.getLength())
sPath = sCID.copy(s_sFormsCID.getLength());
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx
b/desktop/source/deployment/manager/dp_informationprovider.cxx
index 90c75ee..33fa074 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -121,7 +121,7 @@
try
{
const beans::Optional< rtl::OUString > aID = packages[ pos
]->getIdentifier();
-if ( aID.IsPresent && aID.Va
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 45600, which changed state. Bug 45600 Summary: Jump List items in Windows 7 are not visible in Libreoffice 3.4.5 https://bugs.freedesktop.org/show_bug.cgi?id=45600 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#51615 replace button in Find&Replace Dialog not search f...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3197
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/97/3197/1
fdo#51615 replace button in Find&Replace Dialog not search for the next item
Change-Id: Ia1735ae39618fb8b0e4749e1970adfe83192f755
---
M sc/source/ui/view/viewfun2.cxx
1 file changed, 6 insertions(+), 0 deletions(-)
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 22a25ec..6bc810f 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1769,7 +1769,13 @@
|| nCommand == SVX_SEARCHCMD_REPLACE_ALL )
{
if ( nCommand == SVX_SEARCHCMD_REPLACE )
+{
pDocSh->PostPaint( nCol,nRow,nTab, nCol,nRow,nTab, PAINT_GRID
);
+SvxSearchItem aSearchItem = ScGlobal::GetSearchItem();
+aSearchItem.SetCommand(SVX_SEARCHCMD_FIND);
+aSearchItem.SetWhich(SID_SEARCH_ITEM);
+GetViewData()->GetDispatcher().Execute( FID_SEARCH_NOW,
SFX_CALLMODE_STANDARD, &aSearchItem, 0L );
+}
else
pDocSh->PostPaintGridAll();
pDocSh->SetDocumentModified();
--
To view, visit https://gerrit.libreoffice.org/3197
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1735ae39618fb8b0e4749e1970adfe83192f755
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Use OUString in ImplGetEllipsisString()
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3159 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3159 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I02ae342857d2944c3d1a20b8d24bd6fcf3ac1f4a Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christina Roßmanith Gerrit-Reviewer: Christina Roßmanith Gerrit-Reviewer: Michael Stahl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: i18npool/inc
i18npool/inc/i18npool/mslangid.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a123975e4bfcad4f18fa4b336def8e4b8e8577b4 Author: Eike Rathke Date: Wed Apr 3 23:51:39 2013 +0200 let's try if this satisfies MSVC Change-Id: I2cfc88036121d7f31b17804c62e2d1ab84cce45b diff --git a/i18npool/inc/i18npool/mslangid.hxx b/i18npool/inc/i18npool/mslangid.hxx index b29c6df..ce4ca47 100644 --- a/i18npool/inc/i18npool/mslangid.hxx +++ b/i18npool/inc/i18npool/mslangid.hxx @@ -182,7 +182,7 @@ public: sal_Char maCountry[3]; /** Obtain a language tag string with '-' separator. */ -OUString getTagString() const; +I18NISOLANG_DLLPUBLIC OUString getTagString() const; }; /** @internal - Return a pointer to the IsoLangEntry of the underlying table, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/vcl/outdev.hxx |4 -
vcl/source/gdi/outdev3.cxx | 105 ++---
2 files changed, 63 insertions(+), 46 deletions(-)
New commits:
commit 0e137027fcf294b33a9c7376b17a6c4e33758c52
Author: Chr. Rossmanith
Date: Wed Apr 3 22:11:17 2013 +0200
Use OUString in ImplGetEllipsisString()
Change-Id: I02ae342857d2944c3d1a20b8d24bd6fcf3ac1f4a
Reviewed-on: https://gerrit.libreoffice.org/3159
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index a1424f6..df433ff 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -386,7 +386,7 @@ public:
SAL_DLLPRIVATE SalLayout* ImplGlyphFallbackLayout( SalLayout*,
ImplLayoutArgs& ) const;
static
-SAL_DLLPRIVATE XubStringImplGetEllipsisString( const OutputDevice&
rTargetDevice, const XubString& rStr,
+SAL_DLLPRIVATE OUStringImplGetEllipsisString( const OutputDevice&
rTargetDevice, const OUString& rStr,
long nMaxWidth,
sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout );
static
SAL_DLLPRIVATE void ImplDrawText( OutputDevice& rTargetDevice,
const Rectangle& rRect,
@@ -617,7 +617,7 @@ public:
const XubString& rStr, sal_uInt16 nStyle
= TEXT_DRAW_WORDBREAK,
TextRectInfo* pInfo = NULL,
const ::vcl::ITextLayout* _pTextLayout =
NULL ) const;
-OUStringGetEllipsisString( const XubString& rStr, long
nMaxWidth,
+OUStringGetEllipsisString( const OUString& rStr, long
nMaxWidth,
sal_uInt16 nStyle =
TEXT_DRAW_ENDELLIPSIS ) const;
voidDrawCtrlText( const Point& rPos, const XubString& rStr,
xub_StrLen nIndex = 0, xub_StrLen nLen =
STRING_LEN,
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 9cc6369..353a3be 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -6645,7 +6645,7 @@ static sal_Bool ImplIsCharIn( sal_Unicode c, const
sal_Char* pStr )
return sal_False;
}
-OUString OutputDevice::GetEllipsisString( const String& rOrigStr, long
nMaxWidth,
+OUString OutputDevice::GetEllipsisString( const OUString& rOrigStr, long
nMaxWidth,
sal_uInt16 nStyle ) const
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
@@ -6653,44 +6653,62 @@ OUString OutputDevice::GetEllipsisString( const String&
rOrigStr, long nMaxWidth
return ImplGetEllipsisString( *this, rOrigStr, nMaxWidth, nStyle,
aTextLayout );
}
-String OutputDevice::ImplGetEllipsisString( const OutputDevice& rTargetDevice,
const XubString& rOrigStr, long nMaxWidth,
+OUString OutputDevice::ImplGetEllipsisString( const OutputDevice&
rTargetDevice, const OUString& rOrigStr, long nMaxWidth,
sal_uInt16 nStyle, const
::vcl::ITextLayout& _rLayout )
{
-String aStr = rOrigStr;
-xub_StrLen nIndex = _rLayout.GetTextBreak( aStr, nMaxWidth, 0, aStr.Len()
);
-
+OUString aStr = rOrigStr;
+sal_Int32 nIndex = _rLayout.GetTextBreak( aStr, nMaxWidth, 0,
aStr.getLength() );
if ( nIndex != STRING_LEN )
{
if( (nStyle & TEXT_DRAW_CENTERELLIPSIS) == TEXT_DRAW_CENTERELLIPSIS )
{
-String aTmpStr( aStr );
-xub_StrLen nEraseChars = 4;
-while( nEraseChars < aStr.Len() && _rLayout.GetTextWidth( aTmpStr,
0, aTmpStr.Len() ) > nMaxWidth )
+sal_Int32 nOrigWidth = _rLayout.GetTextWidth( aStr, 0,
aStr.getLength() );
+if ( nOrigWidth <= nMaxWidth )
+return aStr;
+sal_Int32 nEraseStart = aStr.getLength()/2;
+sal_Int32 nEraseEnd = nEraseStart;
+sal_Int32 nEraseChars = nEraseEnd - nEraseStart;
+sal_Int32 nEllipsisWidth = _rLayout.GetTextWidth( "...", 0, 3 );
+bool bRemoveForward = true;
+while( nEraseChars < aStr.getLength() &&
+ nOrigWidth - _rLayout.GetTextWidth( aStr, nEraseStart,
nEraseEnd ) > nMaxWidth - nEllipsisWidth)
{
-aTmpStr = aStr;
-xub_StrLen i = (aTmpStr.Len() - nEraseChars)/2;
-aTmpStr.Erase( i, nEraseChars++ );
-aTmpStr.InsertAscii( "...", i );
+if (bRemoveForward)
+++nEraseEnd;
+else
+--nEraseStart;
+bRemoveForward = !bRemoveForward;
+nEraseChars = nEraseEnd - nEraseStart +1;
}
-aStr = aTmpStr;
+OUStringBuffer aTmpStr(aStr);
+aTmpStr.remove(nEraseStart, nEraseChars);
+aTmpStr.insert(nEraseStart, "...");
+aStr = aTmpStr.makeS
[Libreoffice-commits] core.git: offapi/com offapi/type_reference
offapi/com/sun/star/text/textfield/GetExpression.idl |8 +++-
offapi/type_reference/types.rdb |binary
2 files changed, 3 insertions(+), 5 deletions(-)
New commits:
commit ff3d85dbd72a0e547abe573465e65747ef985955
Author: Michael Stahl
Date: Wed Apr 3 23:26:51 2013 +0200
API CHANGE: GetExpression Value is read-only, NumberingType an illusion
The implementation in Writer has Value property read-only since initial
CVS import, and NumberingType property never existed, so adapt
com.sun.star.text.textfield.GetExpression to implementation.
Thanks to the really cool David Ostrovsky for finding these.
Change-Id: I3b12a8103d0d6de7dbf644f30db3f192b0331f0a
SERVICE: /UCR/com/sun/star/text/textfield/GetExpression
SERVICE1 contains 1 more properties as SERVICE2
incompatible change: Field 3 ('NumberingType') of r1 is not longer a
property of this SERVICE in r2
incompatible change: Field 6 ('Value') of r1 is not longer a property of
this SERVICE in r2
incompatible change: Field 5 ('Value') of r2 is a new property compared
to this SERVICE in r1 and is not 'optional'
diff --git a/offapi/com/sun/star/text/textfield/GetExpression.idl
b/offapi/com/sun/star/text/textfield/GetExpression.idl
index cb9f756..4db8f1b 100644
--- a/offapi/com/sun/star/text/textfield/GetExpression.idl
+++ b/offapi/com/sun/star/text/textfield/GetExpression.idl
@@ -42,10 +42,7 @@ published service GetExpression
@see com::sun::star::util::NumberFormatter
*/
[property]long NumberFormat;
-/** specifies the type of the numbering as
-NumberingType
- */
-[property]short NumberingType;
+
/** determines whether the content is displayed or evaluated.
*/
[property]boolean IsShowFormula;
@@ -55,7 +52,8 @@ published service GetExpression
[property]short SubType;
/** contains the numerical value of the field.
*/
-[property]double Value;
+[property, readonly] double Value;
+
/** deprecated
*/
[property]short VariableSubtype;
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index dd39969..48ce5b98 100644
Binary files a/offapi/type_reference/types.rdb and
b/offapi/type_reference/types.rdb differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: src/lib
src/lib/VDXParser.cpp |3 ---
1 file changed, 3 deletions(-)
New commits:
commit be9087d5ac691d7a080bd92d2bd76dbcbf8437fa
Author: Julien Nabet
Date: Wed Apr 3 23:31:10 2013 +0200
tmpInput unused
diff --git a/src/lib/VDXParser.cpp b/src/lib/VDXParser.cpp
index 96d5166..d0b8c8a 100644
--- a/src/lib/VDXParser.cpp
+++ b/src/lib/VDXParser.cpp
@@ -55,7 +55,6 @@ bool libvisio::VDXParser::parseMain()
if (!m_input)
return false;
- WPXInputStream *tmpInput = 0;
try
{
std::vector > groupXFormsSequence;
@@ -80,8 +79,6 @@ bool libvisio::VDXParser::parseMain()
}
catch (...)
{
-if (tmpInput)
- delete tmpInput;
return false;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Patch for libmspub-0.0.5
Hi all,
my name is Franz Schmid, and i'm one of the core Scribus developers.
Finally i had some time to go for a test of the libmspub library.
It works very fine and integrates cleanly in our Scribus build. During
the integration process i've done some minor improvements to libmspup,
namely the detection of some more gradient types and the rotation of
images.
Attached is a patch against git master.
Use:
patch -p1 < Image_Gradients.patch
in the main directory of libmspup to apply the patch.
Hope you accept my patch.
Greetings,
Franz Schmid
>From e95ad141cd4b19ef4b0a47a7c70d56a053dd1caf Mon Sep 17 00:00:00 2001
From: Franz Schmid
Date: Wed, 3 Apr 2013 21:14:47 +0200
Subject: [PATCH 1/2] Added parsing of more gradient types and report rotation for images.
---
src/lib/Fill.cpp | 26 --
src/lib/Fill.h | 13 -
src/lib/FillType.h |8 +++-
src/lib/MSPUBCollector.cpp |5 -
src/lib/MSPUBParser.cpp| 13 -
src/lib/ShapeInfo.h|3 ++-
6 files changed, 57 insertions(+), 11 deletions(-)
diff --git a/src/lib/Fill.cpp b/src/lib/Fill.cpp
index cade9b8..b3abd17 100644
--- a/src/lib/Fill.cpp
+++ b/src/lib/Fill.cpp
@@ -36,7 +36,7 @@ Fill::Fill(const MSPUBCollector *owner) : m_owner(owner)
{
}
-ImgFill::ImgFill(unsigned imgIndex, const MSPUBCollector *owner, bool isTexture) : Fill(owner), m_imgIndex(imgIndex), m_isTexture(isTexture)
+ImgFill::ImgFill(unsigned imgIndex, const MSPUBCollector *owner, bool isTexture, int rot) : Fill(owner), m_imgIndex(imgIndex), m_isTexture(isTexture), m_rotation(rot)
{
}
@@ -53,6 +53,12 @@ WPXPropertyListVector ImgFill::getProperties(WPXPropertyList *out) const
{
out->insert("style:repeat", "stretch");
}
+if (m_rotation != 0)
+ {
+ WPXString sValue;
+ sValue.sprintf("%d", m_rotation);
+ out->insert("libwpg:rotate", sValue);
+ }
}
return WPXPropertyListVector();
}
@@ -63,7 +63,7 @@ WPXPropertyListVector ImgFill::getProperties(WPXPropertyList *out) const
return WPXPropertyListVector();
}
-PatternFill::PatternFill(unsigned imgIndex, const MSPUBCollector *owner, ColorReference fg, ColorReference bg) : ImgFill(imgIndex, owner, true), m_fg(fg), m_bg(bg)
+PatternFill::PatternFill(unsigned imgIndex, const MSPUBCollector *owner, ColorReference fg, ColorReference bg) : ImgFill(imgIndex, owner, true, 0), m_fg(fg), m_bg(bg)
{
}
@@ -110,7 +116,7 @@ WPXPropertyListVector SolidFill::getProperties(WPXPropertyList *out) const
return WPXPropertyListVector();
}
-GradientFill::GradientFill(const MSPUBCollector *owner, double angle) : Fill(owner), m_stops(), m_angle(angle)
+GradientFill::GradientFill(const MSPUBCollector *owner, double angle, int type) : Fill(owner), m_stops(), m_angle(angle), m_type(type)
{
}
@@ -125,6 +131,22 @@ WPXPropertyListVector GradientFill::getProperties(WPXPropertyList *out) const
out->insert("draw:fill", "gradient");
out->insert("svg:fill-rule", "nonzero");
out->insert("draw:angle", -m_angle); // draw:angle is clockwise in odf format
+ switch (m_type)
+ {
+ case 4:
+ case 7:
+ out->insert("libmspub:shade", "normal");
+ break;
+ case 5:
+ out->insert("libmspub:shade", "center");
+ break;
+ case 6:
+ out->insert("libmspub:shade", "shape");
+ break;
+ default:
+ out->insert("libmspub:shade", "normal");
+ break;
+ }
for (unsigned i = 0; i < m_stops.size(); ++i)
{
Color c = m_stops[i].m_colorReference.getFinalColor(m_owner->m_paletteColors);
diff --git a/src/lib/Fill.h b/src/lib/Fill.h
index dc6bc31..e226a65 100644
--- a/src/lib/Fill.h
+++ b/src/lib/Fill.h
@@ -59,11 +59,13 @@ protected:
unsigned m_imgIndex;
private:
bool m_isTexture;
+protected:
+ int m_rotation;
public:
- ImgFill(unsigned imgIndex, const MSPUBCollector *owner, bool isTexture);
+ ImgFill(unsigned imgIndex, const MSPUBCollector *owner, bool isTexture, int rotation);
virtual WPXPropertyListVector getProperties(WPXPropertyList *out) const;
private:
- ImgFill(const ImgFill &) : Fill(NULL), m_imgIndex(0), m_isTexture(false) { }
+ ImgFill(const ImgFill &) : Fill(NULL), m_imgIndex(0), m_isTexture(false), m_rotation(0) { }
ImgFill &operator=(const ImgFill &);
};
@@ -75,7 +77,7 @@ public:
PatternFill(unsigned imgIndex, const MSPUBCollector *owner, ColorReference fg, ColorReference bg);
WPXPropertyListVector getProperties(WPXPropertyList *out) const;
private:
- PatternFill(const PatternFill &) : ImgFill(0, NULL, true), m_fg(0x0800), m_bg(0x0800) { }
+ PatternFill(const PatternFill &) : ImgFill(0, NULL, true, 0), m_fg(0x0800), m_bg(0x0800) { }
PatternFill &operator=(const ImgFill &);
};
@@ -102,12 +104,13 @@ class GradientFill : public Fill
};
std::vector m_stops;
double m_angle;
+ int m_type;
public:
- GradientFill(const MSPUBCollector *owner, double angle = 0);
+ GradientFill(const MSPUBCollector *owner, double angle = 0, int type
[Libreoffice-commits] core.git: 11 commits - sfx2/source
sfx2/source/appl/newhelp.cxx | 74 ++---
sfx2/source/appl/sfxhelp.cxx | 40 +-
sfx2/source/bastyp/helper.cxx | 91 +
sfx2/source/dialog/dinfdlg.cxx | 26 ---
sfx2/source/inc/helper.hxx | 16 +++
5 files changed, 83 insertions(+), 164 deletions(-)
New commits:
commit e9516eb4335ec9db3cee6ce2468c880403386f08
Author: Markus Mohrhard
Date: Wed Apr 3 23:26:15 2013 +0200
limit scope of the variable
Change-Id: Ic6001ca66e85cdeb4c797aaab1138c27b9e17c67
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 87d62cf..297e356 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -683,7 +683,6 @@ sal_Bool SfxHelp::Start_Impl(const OUString& rURL, const
Window* pWindow, const
OUString aHelpURL;
INetURLObject aParser( rURL );
INetProtocol nProtocol = aParser.GetProtocol();
-OUString aHelpModuleName( GetHelpModuleName_Impl() );
switch ( nProtocol )
{
@@ -693,6 +692,7 @@ sal_Bool SfxHelp::Start_Impl(const OUString& rURL, const
Window* pWindow, const
break;
default:
{
+OUString aHelpModuleName( GetHelpModuleName_Impl() );
// no URL, just a HelpID (maybe empty in case of keyword search)
aHelpURL = CreateHelpURL_Impl( rURL, aHelpModuleName );
commit 5a7dbd4d8bcc4ac86ef6e6ca4534b279e81a4355
Author: Markus Mohrhard
Date: Wed Apr 3 23:12:24 2013 +0200
maybe a bit over-engineered
Change-Id: Ia7a491241ad78cafc542e63b3796b7c32fa5300c
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index a2a7445..87d62cf 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -216,18 +216,9 @@ public:
static Sequence< OUString > GetPropertyNames()
{
-static const char* aPropNames[] =
-{
-"HelpAgentStarterList",
-};
-
-const int nCount = sizeof( aPropNames ) / sizeof( const char* );
-Sequence< OUString > aNames( nCount );
+Sequence< OUString > aNames( 1 );
OUString* pNames = aNames.getArray();
-OUString* pEnd = pNames + aNames.getLength();
-int i = 0;
-for ( ; pNames != pEnd; ++pNames )
-*pNames = OUString::createFromAscii( aPropNames[i++] );
+pNames[0] = OUString( "HelpAgentStarterList" );
return aNames;
}
commit 8948dfdb693c7565a02f3fe1f235fb6c7d3ddc44
Author: Markus Mohrhard
Date: Wed Apr 3 23:08:58 2013 +0200
screen space is a valuable good, don't waste it
Change-Id: I67d47ef4030ce60d1cbc160a52cad7cc3c417b34
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 4538ce4..a2a7445 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -206,12 +206,12 @@ private:
std::set < OString > m_aIds;
public:
-SfxHelpOptions_Impl();
-~SfxHelpOptions_Impl();
+SfxHelpOptions_Impl();
+~SfxHelpOptions_Impl();
-boolHasId( const OString& rId ) { return m_aIds.size() ?
m_aIds.find( rId ) != m_aIds.end() : false; }
-virtual voidNotify( const com::sun::star::uno::Sequence<
OUString >& aPropertyNames );
-virtual voidCommit();
+bool HasId( const OString& rId ) { return m_aIds.size() ? m_aIds.find( rId
) != m_aIds.end() : false; }
+virtual void Notify( const com::sun::star::uno::Sequence< OUString >&
aPropertyNames );
+virtual void Commit();
};
static Sequence< OUString > GetPropertyNames()
@@ -298,7 +298,7 @@ void SfxHelpOptions_Impl::Commit()
class SfxHelp_Impl
{
private:
-SfxHelpOptions_Impl*m_pOpt; // the options
+SfxHelpOptions_Impl* m_pOpt; // the options
public:
SfxHelp_Impl();
@@ -309,9 +309,7 @@ public:
};
SfxHelp_Impl::SfxHelp_Impl() :
-
-m_pOpt ( NULL )
-
+m_pOpt ( NULL )
{
}
@@ -342,10 +340,8 @@ SfxHelpOptions_Impl* SfxHelp_Impl::GetOptions()
}
SfxHelp::SfxHelp() :
-
bIsDebug( sal_False ),
pImp( NULL )
-
{
// read the environment variable "HELP_DEBUG"
// if it's set, you will see debug output on active help
commit 677b125ae3f14d823ebdddf04d22cf879a3cfd4f
Author: Markus Mohrhard
Date: Wed Apr 3 23:04:39 2013 +0200
this variable was unused
Change-Id: I7ea23acbaebb02def5d7875bc07fb7c10b2af883
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 0517b65b..4538ce4 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -299,7 +299,6 @@ class SfxHelp_Impl
{
private:
SfxHelpOptions_Impl*m_pOpt; // the options
-::std::vector< OUString >m_aModulesList; // list of all installed
modules
public:
SfxHelp_Impl();
commit 4290f249be1642c63a958e3f7873b56f47ae5a5b
Author: Markus Mohrhard
Date: Wed Apr 3 23:00:51 2013 +0200
more clean-up around Sfx
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5e/7f4d4db2fd12346742e366f48f91053227471b
5e/7f4d4db2fd12346742e366f48f91053227471b |1 + 1 file changed, 1 insertion(+) New commits: commit ef237b64043da432b80f892090199c9139793f58 Author: Xisco Fauli Date: Wed Apr 3 23:26:28 2013 +0200 Notes added by 'git notes add' diff --git a/5e/7f4d4db2fd12346742e366f48f91053227471b b/5e/7f4d4db2fd12346742e366f48f91053227471b new file mode 100644 index 000..d8e1a36 --- /dev/null +++ b/5e/7f4d4db2fd12346742e366f48f91053227471b @@ -0,0 +1 @@ +merged as: cc2dd35b24f9ddf14d423cd5f099987223fd6960 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par6.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit f6f836b693a9e04c9fa52dd8883a0da54f011dcf
Author: Xisco Fauli
Date: Wed Apr 3 23:24:44 2013 +0200
Revert "Fix issue i120718: after save the sample file with page border and
shadow to doc, the shadow depth and color changed"
This reverts commit ac4c6860961264d23504df90ccf805bd25be032f.
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index c022db6..c37da4a 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1398,9 +1398,7 @@ bool SwWW8ImplReader::SetShadow(SvxShadowItem& rShadow,
const short *pSizeArray,
if (bRet)
{
rShadow.SetColor(Color(COL_BLACK));
-//i120718
-short nVal = pbrc[WW8_RIGHT].DetermineBorderProperties(bVer67);
-//End
+short nVal = pSizeArray[WW8_RIGHT];
if (nVal < 0x10)
nVal = 0x10;
rShadow.SetWidth(nVal);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-4-0] use matching separators and format codes of es_AR
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3196 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/96/3196/1 use matching separators and format codes of es_AR Noticed due to the change in es_PE as of bd4b06fcd84c0f7f3ad82c1a3fe7f91740c5c3c5 See also https://ssl.icu-project.org/icu-bin/locexp?d_=en&_=es_AR https://ssl.icu-project.org/icu-bin/locexp?d_=en&_=es_VE Change-Id: I7ecedd9b111ed95dc68f22a0894f32c8a75ffe5d (cherry picked from commit 640b57dd5fcd7aaeeb334d27fd0982bb516129a7) --- M i18npool/source/localedata/data/es_VE.xml 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/i18npool/source/localedata/data/es_VE.xml b/i18npool/source/localedata/data/es_VE.xml index a82138a..532a3d8 100644 --- a/i18npool/source/localedata/data/es_VE.xml +++ b/i18npool/source/localedata/data/es_VE.xml @@ -31,8 +31,8 @@ generic - - + + -- To view, visit https://gerrit.libreoffice.org/3196 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7ecedd9b111ed95dc68f22a0894f32c8a75ffe5d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] use es_AR separators when using es_AR formats
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3195 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/95/3195/1 use es_AR separators when using es_AR formats Noticed due to the change in es_PE as of bd4b06fcd84c0f7f3ad82c1a3fe7f91740c5c3c5 See also https://ssl.icu-project.org/icu-bin/locexp?d_=en&_=es_AR https://ssl.icu-project.org/icu-bin/locexp?d_=en&_=es_PY Change-Id: I60e35a14a515a4e6e0d91aacf2a3540f31928415 (cherry picked from commit 59665f86057557e8cd66ee420df94b4d91a1b2de) --- M i18npool/source/localedata/data/es_PY.xml 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18npool/source/localedata/data/es_PY.xml b/i18npool/source/localedata/data/es_PY.xml index 89de162..acbc1ec 100644 --- a/i18npool/source/localedata/data/es_PY.xml +++ b/i18npool/source/localedata/data/es_PY.xml @@ -31,7 +31,7 @@ generic - + -- To view, visit https://gerrit.libreoffice.org/3195 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I60e35a14a515a4e6e0d91aacf2a3540f31928415 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sd/source sw/source
sd/source/filter/eppt/pptexanimations.cxx |3 +--
sw/source/filter/ww8/ww8par6.cxx |4 +++-
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit cc2dd35b24f9ddf14d423cd5f099987223fd6960
Author: Sun Ying
Date: Mon Sep 10 01:29:08 2012 +
#119711# support the delay var when export ppt file by AOO
Reported by: Wang Li Feng
Patch by: Ying Sun
Review by: Jian Yuan Li
diff --git a/sd/source/filter/eppt/pptexanimations.cxx
b/sd/source/filter/eppt/pptexanimations.cxx
index bac80c9..663bd98 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -1352,8 +1352,7 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm,
const Reference< XAnim
else if ( aAny >>= fTiming )
{
bCreateEvent = sal_True;
-if ( eTiming == Timing_INDEFINITE )
-nBegin = (sal_Int32)( fTiming * 1000.0 );
+nBegin = (sal_Int32)( fTiming * 1000.0 );
}
}
break;
commit ac4c6860961264d23504df90ccf805bd25be032f
Author: Jian Hong Cheng
Date: Fri Aug 31 10:07:04 2012 +
Fix issue i120718: after save the sample file with page border and shadow
to doc, the shadow depth and color changed
* source/filter/ww8/ww8par6.cxx
MS Word Binary compatibility
Patch by: Fan Zheng,
Found by: dongjun zong,
Review by: Jian Hong Cheng,
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index c37da4a..c022db6 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1398,7 +1398,9 @@ bool SwWW8ImplReader::SetShadow(SvxShadowItem& rShadow,
const short *pSizeArray,
if (bRet)
{
rShadow.SetColor(Color(COL_BLACK));
-short nVal = pSizeArray[WW8_RIGHT];
+//i120718
+short nVal = pbrc[WW8_RIGHT].DetermineBorderProperties(bVer67);
+//End
if (nVal < 0x10)
nVal = 0x10;
rShadow.SetWidth(nVal);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - i18npool/source
i18npool/source/localedata/data/es_PY.xml |2 +- i18npool/source/localedata/data/es_VE.xml |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 640b57dd5fcd7aaeeb334d27fd0982bb516129a7 Author: Eike Rathke Date: Wed Apr 3 23:20:05 2013 +0200 use matching separators and format codes of es_AR Noticed due to the change in es_PE as of bd4b06fcd84c0f7f3ad82c1a3fe7f91740c5c3c5 See also https://ssl.icu-project.org/icu-bin/locexp?d_=en&_=es_AR https://ssl.icu-project.org/icu-bin/locexp?d_=en&_=es_VE Change-Id: I7ecedd9b111ed95dc68f22a0894f32c8a75ffe5d diff --git a/i18npool/source/localedata/data/es_VE.xml b/i18npool/source/localedata/data/es_VE.xml index a82138a..532a3d8 100644 --- a/i18npool/source/localedata/data/es_VE.xml +++ b/i18npool/source/localedata/data/es_VE.xml @@ -31,8 +31,8 @@ generic - - + + commit 59665f86057557e8cd66ee420df94b4d91a1b2de Author: Eike Rathke Date: Wed Apr 3 23:10:16 2013 +0200 use es_AR separators when using es_AR formats Noticed due to the change in es_PE as of bd4b06fcd84c0f7f3ad82c1a3fe7f91740c5c3c5 See also https://ssl.icu-project.org/icu-bin/locexp?d_=en&_=es_AR https://ssl.icu-project.org/icu-bin/locexp?d_=en&_=es_PY Change-Id: I60e35a14a515a4e6e0d91aacf2a3540f31928415 diff --git a/i18npool/source/localedata/data/es_PY.xml b/i18npool/source/localedata/data/es_PY.xml index 89de162..acbc1ec 100644 --- a/i18npool/source/localedata/data/es_PY.xml +++ b/i18npool/source/localedata/data/es_PY.xml @@ -31,7 +31,7 @@ generic - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - configure.ac RepositoryExternal.mk unoxml/qa unoxml/source
RepositoryExternal.mk|1
configure.ac |2 +
unoxml/qa/complex/unoxml/RDFRepositoryTest.java | 14 +++
unoxml/qa/complex/unoxml/testdocuments/cve_2012_0037.rdf | 19 +++
unoxml/source/rdf/librdf_repository.cxx | 10 ---
5 files changed, 35 insertions(+), 11 deletions(-)
New commits:
commit df2ecdcb6e604f8e1dcea1549c929a1ced06c583
Author: Michael Stahl
Date: Wed Apr 3 22:52:40 2013 +0200
unordf: add unit test for CVE-2012-0037
Change-Id: Ife037f05ddf66bc8c0598cb9521e95a1fa15c26e
diff --git a/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
b/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
index c84ab56..4356de0 100644
--- a/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
+++ b/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
@@ -543,6 +543,20 @@ public class RDFRepositoryTest
}
}
+@Test public void checkCVE_2012_0037() throws Exception
+{
+XInputStream xIn = new StreamSimulator(
+TestDocument.getUrl("cve_2012_0037.rdf"), true, param);
+xRep.importGraph(FileFormat.RDF_XML, xIn, manifest, base);
+XNamedGraph xGraph = xRep.getGraph(manifest);
+assertNotNull("no graph", xGraph);
+XEnumeration xEnum = xGraph.getStatements(foo, bar, null);
+// there must not be anything more than "EVIL" in the literal
+XLiteral evil = Literal.create(xContext, "EVIL");
+Statement FooBarEvil = new Statement(foo, bar, evil, manifest);
+assertTrue("EVIL", eq(xEnum, new Statement [] { FooBarEvil }));
+}
+
// utilities -
public void report2(Exception e)
diff --git a/unoxml/qa/complex/unoxml/testdocuments/cve_2012_0037.rdf
b/unoxml/qa/complex/unoxml/testdocuments/cve_2012_0037.rdf
new file mode 100644
index 000..9e2327c
--- /dev/null
+++ b/unoxml/qa/complex/unoxml/testdocuments/cve_2012_0037.rdf
@@ -0,0 +1,19 @@
+
+
+]>
+
+http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
+
+EVIL&file;
+
+
commit 5fccea4add2eb5b838733becdb4dc3120151a82f
Author: Michael Stahl
Date: Wed Apr 3 22:15:57 2013 +0200
unordf: replace external entity disabling handler code ...
... with a configure check for the fixed raptor library.
Change-Id: I495d5d28e9a4e7b6234f8f9d17c2bda36154316d
diff --git a/configure.ac b/configure.ac
index a3f50aa..eabc81a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8475,6 +8475,8 @@ dnl
===
dnl versions before 1.0.8 write RDF/XML that is useless for ODF (@xml:base)
libo_CHECK_SYSTEM_MODULE([redland],[REDLAND],[redland >= 1.0.8])
if test "$with_system_redland" = "yes"; then
+# need at least 2.0.7 for CVE-2012-0037
+PKG_CHECK_MODULES([RAPTOR2],[raptor2 >= 2.0.7])
libo_MINGW_CHECK_DLL([REDLAND], [librdf])
libo_MINGW_TRY_DLL([RAPTOR], [libraptor])
libo_MINGW_TRY_DLL([RASQAL], [librasqal])
diff --git a/unoxml/source/rdf/librdf_repository.cxx
b/unoxml/source/rdf/librdf_repository.cxx
index 733b313..be3e81f 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -32,7 +32,6 @@
#include
#include
-#include
#include
@@ -872,11 +871,6 @@ bool formatNeedsBaseURI(::sal_Int16 i_Format)
return true;
}
-xmlParserInputPtr myExtEntityLoader( const char* /*URL*/, const char* /*ID*/,
xmlParserCtxtPtr /*context*/)
-{
- return NULL;
-}
-
//void SAL_CALL
uno::Reference SAL_CALL
librdf_Repository::importGraph(::sal_Int16 i_Format,
@@ -954,9 +948,6 @@ throw (uno::RuntimeException,
lang::IllegalArgumentException,
"librdf_new_parser failed", *this);
}
-xmlExternalEntityLoader oldExtEntityLoader = xmlGetExternalEntityLoader();
-xmlSetExternalEntityLoader( myExtEntityLoader);
-
uno::Sequence buf;
uno::Reference xSeekable(i_xInStream, uno::UNO_QUERY);
// UGLY: if only that redland junk could read streams...
@@ -982,7 +973,6 @@ throw (uno::RuntimeException,
lang::IllegalArgumentException,
"librdf_model_context_add_statements failed", *this);
}
-xmlSetExternalEntityLoader( oldExtEntityLoader);
return getGraph(i_xGraphName);
}
commit cf176b444aa5d2b3fbb352fb723c0f6322ea1379
Author: Michael Stahl
Date: Wed Apr 3 21:58:34 2013 +0200
redland does no longer use openssl
Change-Id: I704a5a5ae4122fadf0fe5f8ec07ad3cb0bbefee2
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 295058f..dee5eff 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -932,7 +932,6 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
rdf \
rasqal \
raptor2 \
- crypto \
)
endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[PATCH libreoffice-4-0] decimal and group separators were swapped
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3194 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/94/3194/1 decimal and group separators were swapped See also https://ssl.icu-project.org/icu-bin/locexp?d_=en&_=es_PE Change-Id: I67ca6f1a7a721b308092f20eaab238f5a8f45061 (cherry picked from commit bd4b06fcd84c0f7f3ad82c1a3fe7f91740c5c3c5) --- M i18npool/source/localedata/data/es_PE.xml 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/i18npool/source/localedata/data/es_PE.xml b/i18npool/source/localedata/data/es_PE.xml index 2f75eb7..a0a9bc4 100644 --- a/i18npool/source/localedata/data/es_PE.xml +++ b/i18npool/source/localedata/data/es_PE.xml @@ -34,10 +34,10 @@ / - . - , + , + . : - , + . ; de @@ -136,10 +136,10 @@ [HH]:MM:SS - MM:SS,00 + MM:SS.00 - [HH]:MM:SS,00 + [HH]:MM:SS.00 DD/MM/AA HH:MM @@ -154,46 +154,46 @@ 0 - 0,00 + 0.00 - #.##0 + #,##0 - #.##0,00 + #,##0.00 - #.###,00 + #,###.00 - [CURRENCY]#.##0;[CURRENCY]-#.##0 + [CURRENCY]#,##0;[CURRENCY]-#,##0 - [CURRENCY]#.##0,00;[CURRENCY]-#.##0,00 + [CURRENCY]#,##0.00;[CURRENCY]-#,##0.00 - [CURRENCY]#.##0;[RED][CURRENCY]-#.##0 + [CURRENCY]#,##0;[RED][CURRENCY]-#,##0 - [CURRENCY]#.##0,00;[RED][CURRENCY]-#.##0,00 + [CURRENCY]#,##0.00;[RED][CURRENCY]-#,##0.00 - #.##0,00 CCC + #,##0.00 CCC - [CURRENCY]#.##0,--;[RED][CURRENCY]-#.##0,-- + [CURRENCY]#,##0.--;[RED][CURRENCY]-#,##0.-- 0% - 0,00% + 0.00% - 0,00E+000 + 0.00E+000 - 0,00E+00 + 0.00E+00 -- To view, visit https://gerrit.libreoffice.org/3194 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I67ca6f1a7a721b308092f20eaab238f5a8f45061 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/localedata/data/es_PE.xml | 36 +++--- 1 file changed, 18 insertions(+), 18 deletions(-) New commits: commit bd4b06fcd84c0f7f3ad82c1a3fe7f91740c5c3c5 Author: Eike Rathke Date: Wed Apr 3 22:47:42 2013 +0200 decimal and group separators were swapped See also https://ssl.icu-project.org/icu-bin/locexp?d_=en&_=es_PE Change-Id: I67ca6f1a7a721b308092f20eaab238f5a8f45061 diff --git a/i18npool/source/localedata/data/es_PE.xml b/i18npool/source/localedata/data/es_PE.xml index 2f75eb7..a0a9bc4 100644 --- a/i18npool/source/localedata/data/es_PE.xml +++ b/i18npool/source/localedata/data/es_PE.xml @@ -34,10 +34,10 @@ / - . - , + , + . : - , + . ; de @@ -136,10 +136,10 @@ [HH]:MM:SS - MM:SS,00 + MM:SS.00 - [HH]:MM:SS,00 + [HH]:MM:SS.00 DD/MM/AA HH:MM @@ -154,46 +154,46 @@ 0 - 0,00 + 0.00 - #.##0 + #,##0 - #.##0,00 + #,##0.00 - #.###,00 + #,###.00 - [CURRENCY]#.##0;[CURRENCY]-#.##0 + [CURRENCY]#,##0;[CURRENCY]-#,##0 - [CURRENCY]#.##0,00;[CURRENCY]-#.##0,00 + [CURRENCY]#,##0.00;[CURRENCY]-#,##0.00 - [CURRENCY]#.##0;[RED][CURRENCY]-#.##0 + [CURRENCY]#,##0;[RED][CURRENCY]-#,##0 - [CURRENCY]#.##0,00;[RED][CURRENCY]-#.##0,00 + [CURRENCY]#,##0.00;[RED][CURRENCY]-#,##0.00 - #.##0,00 CCC + #,##0.00 CCC - [CURRENCY]#.##0,--;[RED][CURRENCY]-#.##0,-- + [CURRENCY]#,##0.--;[RED][CURRENCY]-#,##0.-- 0% - 0,00% + 0.00% - 0,00E+000 + 0.00E+000 - 0,00E+00 + 0.00E+00 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[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/3179 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3179 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I20f539bd9fa62bef2e9a2a82b59e0b15f4efdd48 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ioan Radu Gerrit-Reviewer: Thomas Arnhold ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sal/inc vbahelper/source
sal/inc/sal/log-areas.dox |1 +
vbahelper/source/msforms/service.cxx|4 ++--
vbahelper/source/msforms/vbacombobox.cxx|4 ++--
vbahelper/source/msforms/vbatogglebutton.cxx|8
vbahelper/source/msforms/vbauserform.cxx|8
vbahelper/source/vbahelper/vbacommandbar.cxx|2 +-
vbahelper/source/vbahelper/vbacommandbarcontrol.cxx |2 +-
vbahelper/source/vbahelper/vbacommandbarhelper.cxx |2 +-
vbahelper/source/vbahelper/vbadocumentbase.cxx |2 +-
vbahelper/source/vbahelper/vbaeventshelperbase.cxx |6 +++---
vbahelper/source/vbahelper/vbahelper.cxx| 10 --
vbahelper/source/vbahelper/vbashape.cxx |2 +-
12 files changed, 25 insertions(+), 26 deletions(-)
New commits:
commit 16d142443395b888c909fa92570e1a47833da3ff
Author: Radu Ioan
Date: Wed Apr 3 00:04:46 2013 +0300
fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
- replaced osl_trace with sal_info
- added new log areas to log-area.dox
Change-Id: I20f539bd9fa62bef2e9a2a82b59e0b15f4efdd48
Reviewed-on: https://gerrit.libreoffice.org/3179
Reviewed-by: Thomas Arnhold
Tested-by: Thomas Arnhold
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index c36c742..b14cb46 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -334,6 +334,7 @@ certain functionality.
@li @c ucbhelper
@li @c unoidl
@li @c uui
+@li @c vbahelper
@li @c xmlhelp
@li @c xmloff
@li @c xmlreader
diff --git a/vbahelper/source/msforms/service.cxx
b/vbahelper/source/msforms/service.cxx
index 9bc7953..5a9120f 100644
--- a/vbahelper/source/msforms/service.cxx
+++ b/vbahelper/source/msforms/service.cxx
@@ -46,10 +46,10 @@ extern "C"
const sal_Char * pImplName, lang::XMultiServiceFactory *
pServiceManager,
registry::XRegistryKey * pRegistryKey )
{
-OSL_TRACE("In component_getFactory for %s", pImplName );
+SAL_INFO("vbahelper", "In component_getFactory for " << pImplName );
void* pRet = component_getFactoryHelper(
pImplName, pServiceManager, pRegistryKey,
controlprovider::serviceDecl, userform::serviceDecl );
-OSL_TRACE("Ret is 0x%x", pRet);
+SAL_INFO("vbahelper", "Ret is 0x" << std::hex << pRet);
return pRet;
}
}
diff --git a/vbahelper/source/msforms/vbacombobox.cxx
b/vbahelper/source/msforms/vbacombobox.cxx
index b78dea3..63856e5 100644
--- a/vbahelper/source/msforms/vbacombobox.cxx
+++ b/vbahelper/source/msforms/vbacombobox.cxx
@@ -104,13 +104,13 @@ ScVbaComboBox::getListIndex() throw
(uno::RuntimeException)
{
if ( sItems[ index ].equals( sText ) )
{
-OSL_TRACE("getListIndex returning %d", index );
+SAL_INFO("vbahelper", "getListIndex returning " << index );
return uno::makeAny( index );
}
}
}
-OSL_TRACE("getListIndex returning %d", -1 );
+SAL_INFO("vbahelper", "getListIndex returning -1" );
return uno::makeAny( sal_Int32( -1 ) );
}
diff --git a/vbahelper/source/msforms/vbatogglebutton.cxx
b/vbahelper/source/msforms/vbatogglebutton.cxx
index 6bf65c1..93073bc 100644
--- a/vbahelper/source/msforms/vbatogglebutton.cxx
+++ b/vbahelper/source/msforms/vbatogglebutton.cxx
@@ -29,13 +29,13 @@ const static OUString TOGGLE( "Toggle" );
const static OUString STATE( "State" );
ScVbaToggleButton::ScVbaToggleButton( const css::uno::Reference<
ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext
>& xContext, const uno::Reference< uno::XInterface >& xControl, const
uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes*
pGeomHelper ) : ToggleButtonImpl_BASE( xParent, xContext, xControl, xModel,
pGeomHelper )
{
-OSL_TRACE("ScVbaToggleButton(ctor)");
+SAL_INFO("vbahelper", "ScVbaToggleButton(ctor)");
m_xProps->setPropertyValue( TOGGLE, uno::makeAny( sal_True ) );
}
ScVbaToggleButton::~ScVbaToggleButton()
{
-OSL_TRACE("~ScVbaToggleButton(dtor)");
+SAL_INFO("vbahelper", "~ScVbaToggleButton(dtor)");
}
// Attributes
@@ -67,9 +67,9 @@ ScVbaToggleButton::setValue( const uno::Any& _value ) throw
(uno::RuntimeExcepti
{
sal_Int16 nState = 0;
_value >>= nState;
-OSL_TRACE( "nState - %d", nState );
+SAL_INFO("vbahelper", "nState - " << nState );
nState = ( nState == -1 ) ? 1 : 0;
-OSL_TRACE( "nState - %d", nState );
+SAL_INFO("vbahelper", "nState - " << nState );
m_xProps->setPropertyValue( STATE, uno::makeAny( nState ) );
}
diff --git a/vbahelper/source/msforms/vbauserform.cxx
b/vbahelper/source/msforms/vbauserform.cxx
index 988e837..e2a7652 100644
--- a/vbahelper/source/msforms/vbauserform.cxx
+++ b/vbahelper/source/msforms/vbauserform.cxx
@@ -59,7 +59,7 @@ ScVbaUserForm::~ScVbaUserForm()
void SAL_CALL
ScVbaUserForm::Show( ) throw (uno::R
[Libreoffice-commits] core.git: 7 commits - ios/experimental vcl/coretext vcl/headless vcl/inc
ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj | 16 +
ios/experimental/LibreOffice/LibreOffice/lo.mm |5 -
vcl/coretext/salcoretextfontutils.cxx | 30
--
vcl/coretext/salcoretextlayout.cxx | 14 +++-
vcl/headless/svpgdi.cxx| 12 +++-
vcl/inc/headless/svpgdi.hxx|6 +-
6 files changed, 56 insertions(+), 27 deletions(-)
New commits:
commit de2ccd8e1ad3eeb5545e4dcccfe40ec81929a9ed
Author: Tor Lillqvist
Date: Wed Apr 3 23:36:06 2013 +0300
Bypass fields that are unused for iOS
Change-Id: I378228808ef8f974e574714f48a2faf23123714b
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index ca95dc3..96733ec 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -80,14 +80,17 @@ SvpSalGraphics::SvpSalGraphics() :
m_aLineColor( COL_BLACK ),
m_bUseFillColor( false ),
m_aFillColor( COL_WHITE ),
-m_aTextColor( COL_BLACK ),
m_aDrawMode( basebmp::DrawMode_PAINT ),
+#ifndef IOS
+m_aTextColor( COL_BLACK ),
m_eTextFmt( basebmp::Format::EIGHT_BIT_GREY ),
+#endif
m_bClipSetup( false )
{
+#ifndef IOS
for( int i = 0; i < MAX_FALLBACK; ++i )
m_pServerFont[i] = NULL;
-#ifdef IOS
+#else
mrContext = nil;
mfFakeDPIScale = 1.0;
m_style = new CoreTextStyleInfo();
@@ -115,6 +118,7 @@ void SvpSalGraphics::setDevice(
basebmp::BitmapDeviceSharedPtr& rDevice )
m_aOrigDevice = rDevice;
ResetClipRegion();
+#ifndef IOS
// determine matching bitmap format for masks
sal_uInt32 nDeviceFmt = m_aDevice->getScanlineFormat();
DBG_ASSERT( (nDeviceFmt <= (sal_uInt32)basebmp::Format::MAX),
"SVP::setDevice() with invalid bitmap format" );
@@ -134,6 +138,7 @@ void SvpSalGraphics::setDevice(
basebmp::BitmapDeviceSharedPtr& rDevice )
m_eTextFmt = basebmp::Format::ONE_BIT_LSB_GREY;
break;
}
+#endif
}
void SvpSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
@@ -551,6 +556,9 @@ void SvpSalGraphics::copyArea( long nDestX,
void SvpSalGraphics::copyBits( const SalTwoRect* pPosAry,
SalGraphics* pSrcGraphics )
{
+if( !m_aDevice.get() )
+return;
+
SvpSalGraphics* pSrc = pSrcGraphics ?
static_cast(pSrcGraphics) : this;
basegfx::B2IBox aSrcRect( pPosAry->mnSrcX, pPosAry->mnSrcY,
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index ad544df..50a3f87 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -45,12 +45,16 @@ class SvpSalGraphics : public SalGraphics
basebmp::Color m_aLineColor;
bool m_bUseFillColor;
basebmp::Color m_aFillColor;
-basebmp::Color m_aTextColor;
basebmp::DrawModem_aDrawMode;
+#ifndef IOS
+// These fields are used only when we use FreeType to draw into a
+// headless backend, i.e. not on iOS.
+basebmp::Color m_aTextColor;
ServerFont* m_pServerFont[ MAX_FALLBACK ];
sal_uInt32 m_eTextFmt;
+#endif
basebmp::BitmapDeviceSharedPtr m_aClipMap;
commit ce0c3c1eb1405912f36a3ad7e850a5b4e17a3f2c
Author: Tor Lillqvist
Date: Wed Apr 3 23:33:25 2013 +0300
Ensure we have a CGContext in a couple of more places
Change-Id: I1d0963f51472328a1a5b212ab277c6e72fafd7b9
diff --git a/vcl/coretext/salcoretextlayout.cxx
b/vcl/coretext/salcoretextlayout.cxx
index 7cadbe7..98e2ae4 100644
--- a/vcl/coretext/salcoretextlayout.cxx
+++ b/vcl/coretext/salcoretextlayout.cxx
@@ -301,11 +301,14 @@ long CoreTextLayout::FillDXArray( sal_Int32* pDXArray )
const
bool CoreTextLayout::GetBoundRect( SalGraphics& rGraphics, Rectangle& rVCLRect
) const
{
-
SAL_INFO( "vcl.coretext.layout", "GetBoundRect(" << this << ")" );
+QuartzSalGraphics& gr = static_cast(rGraphics);
+
+if( !gr.CheckContext() )
+return false;
+
if ( !mbHasBoundRectangle ) {
-QuartzSalGraphics& gr = static_cast(rGraphics);
CGRect bound_rect = CTLineGetImageBounds( mpLine, gr.mrContext );
if ( !CGRectIsNull( bound_rect ) ) {
maBoundRectangle = Rectangle(
@@ -464,7 +467,12 @@ int CoreTextLayout::GetTextBreak( long nMaxWidth, long
nCharExtra, int nFactor )
long CoreTextLayout::GetTextWidth() const
{
-CGRect bound_rect = CTLineGetImageBounds(mpLine, mpGraphics->GetContext());
+CGContextRef context = mpGraphics->GetContext();
+if (!context) {
+SAL_INFO( "vcl.coretext.layout", "GetTextWidth(): no context!?");
+return 0;
+}
+CGRect bound_rect = CTLineGetImageBounds(mpLine, context);
long w = round_to_long(bound_rect.size.width *
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2c/78bfa3839c8cb6b7b566194cb5dc11ae024ef2
2c/78bfa3839c8cb6b7b566194cb5dc11ae024ef2 |1 + 1 file changed, 1 insertion(+) New commits: commit ff0b7a8eafb3acf6bba0a0c49759cbbb5f589068 Author: Michael Meeks Date: Wed Apr 3 21:38:41 2013 +0100 Notes added by 'git notes add' diff --git a/2c/78bfa3839c8cb6b7b566194cb5dc11ae024ef2 b/2c/78bfa3839c8cb6b7b566194cb5dc11ae024ef2 new file mode 100644 index 000..0b94ef5 --- /dev/null +++ b/2c/78bfa3839c8cb6b7b566194cb5dc11ae024ef2 @@ -0,0 +1 @@ +prefer: 15175a00c976d48f132bc3458e961d1cb2e62a9b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/uiconfig chart2/uiconfig dbaccess/uiconfig framework/uiconfig reportdesign/uiconfig sc/uiconfig sd/uiconfig starmath/uiconfig sw/uiconfig
basctl/uiconfig/basicide/statusbar/statusbar.xml | 12 +-- chart2/uiconfig/statusbar/statusbar.xml|4 - dbaccess/uiconfig/dbapp/statusbar/statusbar.xml|8 +- framework/uiconfig/startmodule/toolbar/standardbar.xml |2 reportdesign/uiconfig/dbreport/statusbar/statusbar.xml |4 - sc/uiconfig/scalc/statusbar/statusbar.xml | 18 ++--- sc/uiconfig/scalc/toolbar/standardbar.xml | 52 - sd/uiconfig/sdraw/statusbar/statusbar.xml | 16 ++--- sd/uiconfig/sdraw/toolbar/commentsbar.xml | 10 +-- sd/uiconfig/sdraw/toolbar/tableobjectbar.xml |2 sd/uiconfig/sdraw/toolbar/textobjectbar.xml|4 - sd/uiconfig/simpress/statusbar/statusbar.xml | 16 ++--- sd/uiconfig/simpress/toolbar/commentsbar.xml | 10 +-- sd/uiconfig/simpress/toolbar/insertbar.xml |2 sd/uiconfig/simpress/toolbar/optionsbar.xml|2 sd/uiconfig/simpress/toolbar/tableobjectbar.xml|2 sd/uiconfig/simpress/toolbar/textobjectbar.xml |4 - starmath/uiconfig/smath/statusbar/statusbar.xml|8 +- sw/uiconfig/sglobal/statusbar/statusbar.xml| 20 +++--- sw/uiconfig/sglobal/toolbar/fullscreenbar.xml |2 sw/uiconfig/sglobal/toolbar/mediaobjectbar.xml |2 sw/uiconfig/sglobal/toolbar/previewobjectbar.xml |2 sw/uiconfig/sweb/statusbar/statusbar.xml | 18 ++--- sw/uiconfig/swform/statusbar/statusbar.xml | 18 ++--- sw/uiconfig/swreport/statusbar/statusbar.xml | 18 ++--- sw/uiconfig/swriter/statusbar/statusbar.xml| 22 +++ sw/uiconfig/swriter/toolbar/navigationobjectbar.xml|4 - sw/uiconfig/swxform/statusbar/statusbar.xml| 20 +++--- 28 files changed, 151 insertions(+), 151 deletions(-) New commits: commit 126f29c4741ee0083487db7ca8e76e0ef6cbc50b Author: Michael Meeks Date: Wed Apr 3 21:37:13 2013 +0100 remove obsolete helpids and cleanup uiconfig XML /usr/bin/perl -pi.bak s/\s+statusbar:helpid="helpid:\d+"\s*/ /g; s/\s+toolbar:helpid="helpid:\d+"\s*/ /g; s|" />|"/>|g; Change-Id: Iebb40c7e168835e02a63c17b93adee4139069ee0 diff --git a/basctl/uiconfig/basicide/statusbar/statusbar.xml b/basctl/uiconfig/basicide/statusbar/statusbar.xml index 82f30cf..9e65271 100644 --- a/basctl/uiconfig/basicide/statusbar/statusbar.xml +++ b/basctl/uiconfig/basicide/statusbar/statusbar.xml @@ -18,10 +18,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> http://openoffice.org/2001/statusbar"; xmlns:xlink="http://www.w3.org/1999/xlink";> - - - - - - + + + + + + diff --git a/chart2/uiconfig/statusbar/statusbar.xml b/chart2/uiconfig/statusbar/statusbar.xml index e0f6f9d..4f718b8 100644 --- a/chart2/uiconfig/statusbar/statusbar.xml +++ b/chart2/uiconfig/statusbar/statusbar.xml @@ -18,6 +18,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> http://openoffice.org/2001/statusbar"; xmlns:xlink="http://www.w3.org/1999/xlink";> - - + + diff --git a/dbaccess/uiconfig/dbapp/statusbar/statusbar.xml b/dbaccess/uiconfig/dbapp/statusbar/statusbar.xml index a6fecd1..8e4801d 100644 --- a/dbaccess/uiconfig/dbapp/statusbar/statusbar.xml +++ b/dbaccess/uiconfig/dbapp/statusbar/statusbar.xml @@ -18,8 +18,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> http://openoffice.org/2001/statusbar"; xmlns:xlink="http://www.w3.org/1999/xlink";> - - - - + + + + diff --git a/framework/uiconfig/startmodule/toolbar/standardbar.xml b/framework/uiconfig/startmodule/toolbar/standardbar.xml index 928bc32..ee1d923 100644 --- a/framework/uiconfig/startmodule/toolbar/standardbar.xml +++ b/framework/uiconfig/startmodule/toolbar/standardbar.xml @@ -21,7 +21,7 @@ - + diff --git a/reportdesign/uiconfig/dbreport/statusbar/statusbar.xml b/reportdesign/uiconfig/dbreport/statusbar/statusbar.xml index d5e90ae..f7288ef 100644 --- a/reportdesign/uiconfig/dbreport/statusbar/statusbar.xml +++ b/reportdesign/uiconfig/dbreport/statusbar/statusbar.xml @@ -18,6 +18,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> http://openoffice.org/2001/statusbar"; xmlns:xlink="http://www.w3.org/1999/xlink";> - - + + diff --git a/sc/uiconfig/scalc/statusbar/statusbar.xml b/sc/uiconfig/scalc/statusbar/statusbar.xml index 6293274..9b3df33 100644 --- a/sc/uiconfig/scalc/statusbar/statusbar.xml +++ b/sc/uiconfig/scalc/statusbar/statusbar.xml @@ -18,13 +18,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> http://openoffice.org/2001/statusbar"; xmlns:xlink="http://www.w3.org/1999/xlink";> - - - - - - - - - + + + + + + + + + diff --git a/sc/uiconfig/scalc/toolbar/standardbar.xml b/sc/uiconfig/scalc/toolbar/standardbar.xml i
[Libreoffice-commits] core.git: 5 commits - i18npool/inc i18npool/qa i18npool/source rsc/source svtools/langsupport svtools/source svx/source
i18npool/inc/i18npool/lang.h | 12
i18npool/inc/i18npool/mslangid.hxx |3 +
i18npool/qa/cppunit/test_languagetag.cxx | 50 +++
i18npool/source/isolang/isolang.cxx |8 +++
rsc/source/parser/rscdb.cxx | 79 +--
rsc/source/parser/rscibas.cxx| 75 ++---
svtools/langsupport/langsupport.cxx |3 -
svtools/source/misc/langtab.src |9 ---
svx/source/dialog/langbox.cxx|4 -
9 files changed, 113 insertions(+), 130 deletions(-)
New commits:
commit 1fa455b396c8d0ae1686f2f9e4c0ee04f503081f
Author: Eike Rathke
Date: Wed Apr 3 21:16:01 2013 +0200
ditch unused LANGUAGE_USER[1-9]
Change-Id: I5a3b2b27fa2a7ad22cab2ae6d833707f9e490f27
diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index b761fff..e3643fc 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -375,18 +375,6 @@ typedef unsigned short LanguageType;
#define LANGUAGE_YORUBA 0x046A
#define LANGUAGE_ZULU 0x0435
-/* Not real, but used for legacy. */
-#define LANGUAGE_USER1 0x0201
-#define LANGUAGE_USER2 0x0202
-#define LANGUAGE_USER3 0x0203
-#define LANGUAGE_USER4 0x0204
-#define LANGUAGE_USER5 0x0205
-#define LANGUAGE_USER6 0x0206
-#define LANGUAGE_USER7 0x0207
-#define LANGUAGE_USER8 0x0208
-#define LANGUAGE_USER9 0x0209
-/* Don't use higher USER values here, we reserve them for extension. */
-
/*! use only for import/export of MS documents, number formatter maps it to
*! LANGUAGE_SYSTEM and then to effective system language */
#define LANGUAGE_SYSTEM_DEFAULT 0x0800
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index 9b74545..ca86a9f 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -140,16 +140,6 @@ void RscLangEnum::Init( RscNameTable& rNames )
nTokenCounter++;
}
}
-
-SetConstant( rNames.Put( "LANGUAGE_USER1", CONSTNAME, LANGUAGE_USER1 ),
LANGUAGE_USER1 );
-SetConstant( rNames.Put( "LANGUAGE_USER2", CONSTNAME, LANGUAGE_USER2 ),
LANGUAGE_USER2 );
-SetConstant( rNames.Put( "LANGUAGE_USER3", CONSTNAME, LANGUAGE_USER3 ),
LANGUAGE_USER3 );
-SetConstant( rNames.Put( "LANGUAGE_USER4", CONSTNAME, LANGUAGE_USER4 ),
LANGUAGE_USER4 );
-SetConstant( rNames.Put( "LANGUAGE_USER5", CONSTNAME, LANGUAGE_USER5 ),
LANGUAGE_USER5 );
-SetConstant( rNames.Put( "LANGUAGE_USER6", CONSTNAME, LANGUAGE_USER6 ),
LANGUAGE_USER6 );
-SetConstant( rNames.Put( "LANGUAGE_USER7", CONSTNAME, LANGUAGE_USER7 ),
LANGUAGE_USER7 );
-SetConstant( rNames.Put( "LANGUAGE_USER8", CONSTNAME, LANGUAGE_USER8 ),
LANGUAGE_USER8 );
-SetConstant( rNames.Put( "EXTERN", CONSTNAME, LANGUAGE_USER9 ),
LANGUAGE_USER9 );
}
Atom RscLangEnum::AddLanguage( const char* pLang, RscNameTable& rNames )
diff --git a/svtools/langsupport/langsupport.cxx
b/svtools/langsupport/langsupport.cxx
index 1d5cf7f..efcc5f5 100644
--- a/svtools/langsupport/langsupport.cxx
+++ b/svtools/langsupport/langsupport.cxx
@@ -65,9 +65,6 @@ SAL_IMPLEMENT_MAIN()
{
LanguageType eLang = aTable.GetTypeAtIndex(i);
-if (eLang >= LANGUAGE_USER1 && eLang <= LANGUAGE_USER9)
-continue;
-
if (eLang == LANGUAGE_DONTKNOW ||
eLang == LANGUAGE_NONE ||
eLang == LANGUAGE_HID_HUMAN_INTERFACE_DEVICE ||
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index eb777d3..cafddd7 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -194,15 +194,6 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
< "Ukrainian" ; LANGUAGE_UKRAINIAN ; > ;
< "Uzbek Latin" ; LANGUAGE_UZBEK_LATIN ; > ;
< "Welsh" ; LANGUAGE_WELSH ; > ;
-< "User 1" ; LANGUAGE_USER1 ; > ;
-< "User 2" ; LANGUAGE_USER2 ; > ;
-< "User 3" ; LANGUAGE_USER3 ; > ;
-< "User 4" ; LANGUAGE_USER4 ; > ;
-< "User 5" ; LANGUAGE_USER5 ; > ;
-< "User 6" ; LANGUAGE_USER6 ; > ;
-< "User 7" ; LANGUAGE_USER7 ; > ;
-< "User 8" ; LANGUAGE_USER8 ; > ;
-< "User 9" ; LANGUAGE_USER9 ; > ;
< "Latin" ; LANGUAGE_LATIN ; > ;
< "Esperanto" ; LANGUAGE_USER_ESPERANTO ; > ;
< "Kinyarwanda (Rwanda)" ; LANGUAGE_USER_KINYARWANDA ; > ;
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index a4aac24..5dca172 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -168,8 +168,7 @@ void SvxLanguageBox::Init()
bool bInsert = true;
if ((LANGUAGE_DONTKNOW == nLangType) ||
-(
[Libreoffice-commits] core.git: sc/AllLangResTarget_sc.mk sc/inc sc/source sc/uiconfig sc/UI_scalc.mk sfx2/inc sfx2/source
sc/AllLangResTarget_sc.mk |1
sc/UI_scalc.mk|1
sc/inc/sc.hrc |1
sc/inc/scabstdlg.hxx |3
sc/source/ui/attrdlg/attrdlg.cxx | 63 +++-
sc/source/ui/attrdlg/scdlgfact.cxx| 22 ---
sc/source/ui/attrdlg/scdlgfact.hxx|3
sc/source/ui/attrdlg/tabpages.cxx |1
sc/source/ui/inc/attrdlg.hrc | 31
sc/source/ui/inc/attrdlg.hxx |2
sc/source/ui/inc/tabvwsh.hxx |2
sc/source/ui/src/attrdlg.src | 92
sc/source/ui/view/cellsh3.cxx |3
sc/source/ui/view/formatsh.cxx|3
sc/source/ui/view/tabvwsha.cxx|8 -
sc/uiconfig/scalc/ui/formatcellsdialog.ui | 217 ++
sfx2/inc/sfx2/tabdlg.hxx |1
sfx2/source/dialog/tabdlg.cxx |5
18 files changed, 262 insertions(+), 197 deletions(-)
New commits:
commit e61d41ea3510a9abf40f2cb6a7b8c6009d2513db
Author: Caolán McNamara
Date: Wed Apr 3 16:53:57 2013 +0100
convert calc format cells dialog to .ui format
Change-Id: Ic134909f3e65bcb1aa440f60a156f293225d3edc
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index b58eba4..16529b2 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -77,7 +77,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/src/dbnamdlg.src \
sc/source/ui/src/opredlin.src \
sc/source/ui/src/sortdlg.src \
-sc/source/ui/src/attrdlg.src \
sc/source/ui/src/filter.src \
sc/source/ui/src/colorformat.src \
sc/source/ui/src/condformatdlg.src \
diff --git a/sc/UI_scalc.mk b/sc/UI_scalc.mk
index 46afc89..678bb46 100644
--- a/sc/UI_scalc.mk
+++ b/sc/UI_scalc.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UI_UI,modules/scalc))
$(eval $(call gb_UI_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/cellprotectionpage \
sc/uiconfig/scalc/ui/definename \
+ sc/uiconfig/scalc/ui/formatcellsdialog \
sc/uiconfig/scalc/ui/insertname \
sc/uiconfig/scalc/ui/insertsheet \
sc/uiconfig/scalc/ui/printeroptions \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 0044fc4..ad9ee12 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -946,7 +946,6 @@
#define BMP_END (BMP_START + 100)
#define SC_DIALOGS_START(BMP_END)
-#define RID_SCDLG_ATTR (SC_DIALOGS_START)
#define RID_SCDLG_SORT (SC_DIALOGS_START + 5)
#define RID_SCPAGE_SORT_FIELDS (SC_DIALOGS_START + 6)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 1683d3d..8003cda 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -481,8 +481,7 @@ public:
virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame*pFrame,
//add for ScAttrDlg
Window* pParent,
-const SfxItemSet*
pCellAttrs,
-int nId) = 0;
+const SfxItemSet*
pCellAttrs ) = 0;
virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame*
pFrame, //add for ScHFEditDlg
Window* pParent,
diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx
index c3e570c..fcd0da3 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -31,7 +31,6 @@
#include "tabpages.hxx"
#include "attrdlg.hxx"
#include "scresid.hxx"
-#include "attrdlg.hrc"
#include
#include
#include
@@ -40,41 +39,34 @@
//==
-ScAttrDlg::ScAttrDlg( SfxViewFrame* pFrameP,
- Window* pParent,
- const SfxItemSet* pCellAttrs )
-
-: SfxTabDialog( pFrameP,
- pParent,
- ScResId( RID_SCDLG_ATTR ),
- pCellAttrs )
+ScAttrDlg::ScAttrDlg(SfxViewFrame* pFrameP, Window* pParent, const SfxItemSet*
pCellAttrs)
+: SfxTabDialog(pFrameP, pParent, "FormatCellsDialog",
"modules/scalc/ui/formatcellsdialog.ui", pCellAttrs)
{
SvtCJKOptions aCJKOptions;
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ),
"GetTabPageCreatorFunc fail!");
-AddTabPage( TP_NUMBER, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_NUMBERFORMAT ), 0 );
+m_nNumberPageId = AddTabPage( "numbers", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_NUMBERFORMAT ), 0 );
OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ),
"GetTabPageCreatorFunc fail!");
-AddTabPage( TP_FONT, pFact->GetTabPageCreatorFunc( RID_SVX
Re: Redland - Build error in Ubuntu 12.10 x86
Thanks Caolan! Now it's working :) 2013/4/3 Caolán McNamara > On Wed, 2013-04-03 at 14:45 -0300, Marcos Souza wrote: > > Hi guys, > > > > > > In master , I'm getting this error: > > > /home/marcos/gitroot/core/solver/unxlngi6/inc/external/rasqal.h:672:81: > error: unknown type name 'raptor_message_handler' > > /home/marcos/gitroot/core/solver/unxlngi6/inc/external/rasqal.h:674:75: > error: unknown type name 'raptor_message_handler' > > Try... > rm /home/marcos/gitroot/core/solver/unxlngi6/inc/external/rasqal.h > and make again. > > C. > > > -- Att, Marcos Paulo de Souza Acadêmico de Ciencia da Computação - FURB - SC Github: https://github.com/marcosps/ "Uma vida sem desafios é uma vida sem razão" "A life without challenges, is a non reason life" ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Redland - Build error in Ubuntu 12.10 x86
On Wed, 2013-04-03 at 14:45 -0300, Marcos Souza wrote: > Hi guys, > > > In master , I'm getting this error: > /home/marcos/gitroot/core/solver/unxlngi6/inc/external/rasqal.h:672:81: > error: unknown type name 'raptor_message_handler' > /home/marcos/gitroot/core/solver/unxlngi6/inc/external/rasqal.h:674:75: > error: unknown type name 'raptor_message_handler' Try... rm /home/marcos/gitroot/core/solver/unxlngi6/inc/external/rasqal.h and make again. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[no subject]
I confirm that all of my past and future contributions to the LibreOffice project are licensed under the MPL / LGPLv3+. Kind regards, Honza Minarik ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#62099 UI: More intuitive text for menu 'Insert - File' C...
Hi Vishy, Vishv Brahmbhatt (via Code Review) schrieb: Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3193 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/93/3193/1 fdo#62099 UI: More intuitive text for menu 'Insert - File' the current item 'File...' can not only import 'draw' files but also own and foreign presentations, and plain text, html, and rtf-text. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Redland - Build error in Ubuntu 12.10 x86
Hi guys, In master , I'm getting this error: Redland build summary: Using monolithic storage backends Oracle Berkeley DB (BDB) : Missing Triple stores available : memory file hashes(memory) trees Triple stores enabled: memory file hashes trees RDF parsers : raptor(system ) RDF query: rasqal(system ) Content digests : md5 sha1 Making all in libltdl Making all in src Making all in win32 libtool: compile: gcc -DHAVE_CONFIG_H -I. -I/home/marcos/gitroot/core/solver/unxlngi6/inc/external -I/home/marcos/gitroot/core/workdir/unxlngi6/UnpackedTarball/raptor/src -I/home/marcos/gitroot/core/workdir/unxlngi6/UnpackedTarball/rasqal/src -DPKGDATADIR=\"/usr/local/share/redland\" -I/home/marcos/gitroot/core/solver/unxlngi6/inc/external -I/home/marcos/gitroot/core/solver/unxlngi6/inc/external -I/home/marcos/gitroot/core/workdir/unxlngi6/UnpackedTarball/raptor/src -I/home/marcos/gitroot/core/workdir/unxlngi6/UnpackedTarball/rasqal/src -DLIBRDF_INTERNAL=1 -MT rdf_init.lo -MD -MP -MF .deps/rdf_init.Tpo -c rdf_init.c -fPIC -DPIC -o .libs/rdf_init.o libtool: compile: gcc -DHAVE_CONFIG_H -I. -I/home/marcos/gitroot/core/solver/unxlngi6/inc/external -I/home/marcos/gitroot/core/workdir/unxlngi6/UnpackedTarball/raptor/src -I/home/marcos/gitroot/core/workdir/unxlngi6/UnpackedTarball/rasqal/src -DPKGDATADIR=\"/usr/local/share/redland\" -I/home/marcos/gitroot/core/solver/unxlngi6/inc/external -I/home/marcos/gitroot/core/solver/unxlngi6/inc/external -I/home/marcos/gitroot/core/workdir/unxlngi6/UnpackedTarball/raptor/src -I/home/marcos/gitroot/core/workdir/unxlngi6/UnpackedTarball/rasqal/src -DLIBRDF_INTERNAL=1 -MT rdf_raptor.lo -MD -MP -MF .deps/rdf_raptor.Tpo -c rdf_raptor.c -fPIC -DPIC -o .libs/rdf_raptor.o In file included from ./librdf.h:33:0, from ./redland.h:30, from rdf_raptor.c:37: /home/marcos/gitroot/core/solver/unxlngi6/inc/external/rasqal.h:672:81: error: unknown type name 'raptor_message_handler' /home/marcos/gitroot/core/solver/unxlngi6/inc/external/rasqal.h:674:75: error: unknown type name 'raptor_message_handler' If you need more info, please ask :) Thanks guys! -- Att, Marcos Paulo de Souza Acadêmico de Ciencia da Computação - FURB - SC Github: https://github.com/marcosps/ "Uma vida sem desafios é uma vida sem razão" "A life without challenges, is a non reason life" ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] [Moztrap] Some questions to the test cases, particularly #130
Hello Yifan, *, On Wed, Apr 03, 2013 at 02:12:32PM +0800, Yifan Jiang wrote: > > > In English // steps > > > > > > Launch LibreOffice main program (vp. 1) > > > Click on the "File" menu (vp. 2 vp. 3) > > > > > > In English // expected result > > > > > > 1. The welcome window should be appeared > > > > That is a different point, I nearly forgot ... :( IIRC the welcome > > window only appears, when no LO was installed before, or am I wrong > > ;? Thanks for your answer (and forwarding this mail to the dev ML as > > well Thomas. > > Did you mean "splash screen", which is I usually called, with loading > progress bar during launching LO? It disappears after LO loaded. no. You have written above 1. The welcome window should be appeared and on this I have written my comment ... ;) > The welcome window in test case means the first screen shown > immediately after launching `libreoffice` without components (writer, > calc, base etc.) opened. That is called "StartCenter" (Startcenter?), IIRC ... ;) > The screenshot explains it :) I see only the StartCenter on it, not the "welcome window" ... :( IIRC was the welcome window the first window (if you have never installed LO before ... ;) ), where you could configure your name and the like ... You can find it at http://www.openoffice.org/download/common/instructions.html for example, when you search for "welcome w" or in an older setup guide for OOo (http://www.google.com/url?sa=t&rct=j&q=%22welcome%20window%22&source=web&cd=3&cad=rja&ved=0CDwQFjAC&url=http%3A%2F%2Fwww.openoffice.org%2Fdocumentation%2Fsetup_guide2%2F2.x%2Fen%2FSETUP_GUIDE_A4.pdf&ei=GmNcUcWrF9SN4gSiiQE&usg=AFQjCNG1M-7J_xn3LclC0sle5Saa51aBjw&bvm=bv.44697112,d.bGE ... Sorry for this long link, but I have found the link with the search on OOo's website ... :( And attention: It is an PDF file ... ;) ). Have a nice evening Thomas. -- Why not? -- What? -- Why not? -- Why should I not send it? -- Why should I not dispatch it? -- Why not? -- Strange! I don't know why I shouldn't -- Well, then -- You will do me this favor. -- Why not? -- Why should you not do it? -- Why not? -- Strange! I shall do the same for you, when you want me to. Why not? Why should I not do it for you? Strange! Why not? -- I can't think why not. -- Wolfgang Amadeus Mozart, from a letter to his cousin Maria, "The Definitive Biography of PDQ Bach", Peter Schickele ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
License statement
Hello All of my past & future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license Best regards, Hansgerd Schneider ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: .gitignore
.gitignore |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 69072caa91580944f47a3d243084f63350801734 Author: Stephan Bergmann Date: Wed Apr 3 19:19:15 2013 +0200 autogen.lastrun -> autogen.input Change-Id: If205ae9eb25882a107fd1cadfab9ec3516d520db diff --git a/.gitignore b/.gitignore index fc3ecb5..8a45289 100644 --- a/.gitignore +++ b/.gitignore @@ -35,8 +35,7 @@ # autoconf generated stuff /aclocal.m4 /autom4te.cache -/autogen.lastrun -/autogen.lastrun.bak +/autogen.input /ChangeLog /config.Build.log /config.guess ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#62099 UI: More intuitive text for menu 'Insert - File' C...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3193
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/93/3193/1
fdo#62099 UI: More intuitive text for menu 'Insert - File'
Change-Id: I80a1aef56b3a8fa0e1939e63dd2607e18757687d
---
M officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
M scripting/workben/bindings/drawmenubar.xml
M sd/inc/app.hrc
M sd/sdi/_drvwsh.sdi
M sd/sdi/sdraw.sdi
M sd/source/ui/view/drviews8.cxx
M sd/source/ui/view/outlnvs2.cxx
M sd/uiconfig/sdraw/menubar/menubar.xml
M sd/uiconfig/sdraw/toolbar/insertbar.xml
9 files changed, 57 insertions(+), 5 deletions(-)
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index d52bafc..86d84ea 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -733,8 +733,14 @@
1
-
+
+
+
+
+ ~Drawing File...
+
+
diff --git a/scripting/workben/bindings/drawmenubar.xml
b/scripting/workben/bindings/drawmenubar.xml
index 4f0d1e9..fa05dbf 100644
--- a/scripting/workben/bindings/drawmenubar.xml
+++ b/scripting/workben/bindings/drawmenubar.xml
@@ -197,7 +197,7 @@
-
+
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 950a930..d68384e 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -74,6 +74,7 @@
#define SID_DIAMODE (SID_SD_START+11)
#define SID_INSERTPAGE (SID_SD_START+14)
#define SID_INSERTFILE (SID_SD_START+15)
+#define SID_INSERTDRAWFILE (SID_SD_START+150)
#define SID_INSERTSYMBOL(SID_SD_START+16)
#define SID_ZOOM_PANNING(SID_SD_START+17)
#define SID_PRESENTATION_END(SID_SD_START+18)
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 98f1539..3155b06 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -1334,6 +1334,11 @@
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
+SID_INSERTDRAWFILE // ole : no, status : todo
+[
+ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
+]
SID_STYLE_FAMILY2 // ole : no, status : ?
[
ExecMethod = FuTemporary ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index d59d62d..71fad6e 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -3317,6 +3317,29 @@
ToolBoxConfig = TRUE,
GroupId = GID_INSERT;
]
+SfxVoidItem ImportFromDrawFile SID_INSERTDRAWFILE
+(SfxStringItem FileName ID_VAL_DUMMY1,SfxStringItem FilterName ID_VAL_DUMMY2)
+[
+/* flags: */
+AutoUpdate = FALSE,
+Cachable = Cachable,
+FastCall = FALSE,
+HasCoreId = FALSE,
+HasDialog = TRUE,
+ReadOnlyDoc = FALSE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+Synchron;
+
+/* config: */
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+StatusBarConfig = FALSE,
+ToolBoxConfig = TRUE,
+GroupId = GID_INSERT;
+]
//--
SfxVoidItem InsertAuthorField SID_INSERT_FLD_AUTHOR
diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx
index ab297b7..ab6a293 100644
--- a/sd/source/ui/view/drviews8.cxx
+++ b/sd/source/ui/view/drviews8.cxx
@@ -225,6 +225,18 @@
}
break;
+case SID_INSERTDRAWFILE:
+{
+Broadcast
(ViewShellHint(ViewShellHint::HINT_COMPLEX_MODEL_CHANGE_START));
+SetCurrentFunction( FuInsertFile::Create( this, GetActiveWindow(),
mpDrawView, GetDoc(), rReq ) );
+Broadcast
(ViewShellHint(ViewShellHint::HINT_COMPLEX_MODEL_CHANGE_END));
+Cancel();
+rReq.Done ();
+
+Invalidate(SID_DRAWTBX_INSERT);
+}
+break;
+
case SID_SELECT_BACKGROUND:
case SID_PAGESETUP: // BASIC ??
{
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index 5a2061e..6b7511d 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -398,7 +398,12 @@
Cancel();
}
break;
-
+case SID_INSERTDRAWFILE:
+{
+SetCurrentFunction( FuInsertFile::Create(this, GetActiveWindow(),
pOlView, GetDoc(), rReq) );
+Cancel();
+}
+break;
case SID_PRESENTATIONOBJECT:
{
SetCurrentFunction( FuPresentationObjects::Create(this,
GetActiveWindow(), pOlView, GetDoc(), rReq) );
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml
b/sd/uiconfig/sdraw/menubar/menubar.xml
index 85ea0e0..0d72f14 100644
--- a/sd/uiconfig/sdraw/menubar/me
[PUSHED libreoffice-4-0] Resolves: fdo#61241 background style dialog too small
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3188 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3188 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie7396b63a64e89bb7aa7c0e284faab7ed380c4c1 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Caolán McNamara Gerrit-Reviewer: Fridrich Strba ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/source
vcl/source/control/tabctrl.cxx |3 ++- vcl/source/window/tabpage.cxx |2 +- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit b307085bcbf5e17c1d72171c33a5cc1cffd70f38 Author: Caolán McNamara Date: Fri Feb 15 12:38:42 2013 + Resolves: fdo#61241 background style dialog too small (cherry picked from commit 1ccbb620946c7032c57054550b08ad5362fe1c3f) Conflicts: vcl/source/control/tabctrl.cxx vcl/source/window/tabpage.cxx Change-Id: Ie7396b63a64e89bb7aa7c0e284faab7ed380c4c1 Reviewed-on: https://gerrit.libreoffice.org/3188 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 4e1afc2..19163f1 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -29,6 +29,7 @@ #include "vcl/tabpage.hxx" #include "vcl/tabctrl.hxx" #include "vcl/controllayout.hxx" +#include "vcl/layout.hxx" #include "vcl/lstbox.hxx" #include "controldata.hxx" @@ -2179,7 +2180,7 @@ Size TabControl::calculateRequisition() const if (!pPage) continue; -Size aPageSize(pPage->GetOptimalSize(WINDOWSIZE_PREFERRED)); +Size aPageSize(VclContainer::getLayoutRequisition(*pPage)); if (aPageSize.Width() > aOptimalPageSize.Width()) aOptimalPageSize.Width() = aPageSize.Width(); diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index 3546c4f..d3b1f34 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -222,7 +222,7 @@ Size TabPage::GetOptimalSize(WindowSizeType eType) const return Window::GetOptimalSize(eType); Size aSize; if (isLayoutEnabled()) -aSize = GetWindow(WINDOW_FIRSTCHILD)->GetOptimalSize(eType); +aSize = VclContainer::getLayoutRequisition(*GetWindow(WINDOW_FIRSTCHILD)); else aSize = getLegacyBestSizeForChildren(*this); return Window::CalcWindowSize(aSize); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fdo#62890: Fix for the dialog PDF Options, register Digital ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3157 Approvals: Björn Michaelsen: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3157 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifbba3e40b27d96da4706c8dcdf4d9ab26069a83f Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andreas Mantke Gerrit-Reviewer: Björn Michaelsen ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 4 commits - canvas/source oox/inc oox/source vcl/inc vcl/source vcl/unx
canvas/source/cairo/cairo_canvasbitmap.cxx| 30 -
canvas/source/cairo/cairo_canvasbitmap.hxx|4
canvas/source/cairo/cairo_xlib_cairo.cxx |7 +
canvas/source/cairo/cairo_xlib_cairo.hxx |1
oox/inc/oox/drawingml/theme.hxx |3
oox/source/drawingml/fillproperties.cxx |3
oox/source/drawingml/graphicshapecontext.cxx |3
oox/source/drawingml/shape.cxx| 18 +--
oox/source/drawingml/theme.cxx|5
oox/source/drawingml/themeelementscontext.cxx | 12 +-
vcl/inc/salbmp.hxx|2
vcl/inc/unx/salbmp.h |7 +
vcl/inc/unx/salgdi.h |5
vcl/inc/vcl/bitmap.hxx|3
vcl/source/gdi/bitmap.cxx | 13 ++
vcl/source/gdi/gdimtf.cxx | 10 -
vcl/source/helper/canvastools.cxx | 25
vcl/unx/generic/gdi/salbmp.cxx| 18 ++-
vcl/unx/generic/gdi/salgdi2.cxx | 151 ++
19 files changed, 225 insertions(+), 95 deletions(-)
New commits:
commit 6b8e311ddc633bb13053d13c5d0f29240039846b
Author: Radek Doulik
Date: Thu Mar 14 09:36:43 2013 +0100
pass argb32 pixmaps from vcl to canvas, avoiding costly x11 roundtrips
- fixes also problem with emf+ rendering for slideshow
Change-Id: Icb894d3f37b29f23d3f267c944d827eefbf47fda
diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx
b/canvas/source/cairo/cairo_canvasbitmap.cxx
index 91f6194..c0759c0 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.cxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.cxx
@@ -134,6 +134,30 @@ namespace cairocanvas
return maCanvasHelper.repaint( pSurface, viewState, renderState );
}
+void SAL_CALL CanvasBitmap::setFastPropertyValue( sal_Int32 nHandle,
const ::com::sun::star::uno::Any& rAny ) throw (uno::RuntimeException)
+{
+sal_Int64 nPointer;
+
+if ( nHandle == 0 )
+{
+rAny >>= nPointer;
+
+if ( nPointer )
+{
+::Bitmap *pBitmap = reinterpret_cast< ::Bitmap* >( nPointer );
+
+mpBufferSurface = createSurface( *pBitmap );
+mpBufferCairo = mpBufferSurface->getCairo();
+
+::Size aSize( pBitmap->GetSizePixel() );
+maSize = ::basegfx::B2ISize( aSize.getWidth(),
aSize.getHeight() );
+
+maCanvasHelper.setSize( maSize );
+maCanvasHelper.setSurface( mpBufferSurface, mbHasAlpha );
+}
+}
+}
+
uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle )
throw (uno::RuntimeException)
{
uno::Any aRV( sal_Int32(0) );
@@ -152,10 +176,11 @@ namespace cairocanvas
#ifdef CAIRO_HAS_XLIB_SURFACE
X11Surface*
pXlibSurface=dynamic_cast(mpBufferSurface.get());
OSL_ASSERT(pXlibSurface);
-uno::Sequence< uno::Any > args( 3 );
+uno::Sequence< uno::Any > args( 4 );
args[0] = uno::Any( false ); // do not call XFreePixmap on it
args[1] = uno::Any( pXlibSurface->getPixmap()->mhDrawable );
args[2] = uno::Any( sal_Int32( pXlibSurface->getDepth() ) );
+args[3] = uno::Any( sal_Int64( pXlibSurface->getVisual () ) );
aRV = uno::Any( args );
#elif defined CAIRO_HAS_QUARTZ_SURFACE
@@ -180,7 +205,7 @@ namespace cairocanvas
case 2:
{
#ifdef CAIRO_HAS_XLIB_SURFACE
-uno::Sequence< uno::Any > args( 3 );
+uno::Sequence< uno::Any > args( 4 );
SurfaceSharedPtr pAlphaSurface =
mpSurfaceProvider->createSurface( maSize, CAIRO_CONTENT_COLOR );
CairoSharedPtr pAlphaCairo = pAlphaSurface->getCairo();
X11Surface*
pXlibSurface=dynamic_cast(pAlphaSurface.get());
@@ -199,6 +224,7 @@ namespace cairocanvas
args[0] = uno::Any( true );
args[1] = ::com::sun::star::uno::Any( pPixmap->mhDrawable );
args[2] = ::com::sun::star::uno::Any( sal_Int32(
pXlibSurface->getDepth () ) );
+args[3] = ::com::sun::star::uno::Any( sal_Int64(
pXlibSurface->getVisual () ) );
pPixmap->clear(); // caller takes ownership of pixmap
// return pixmap and alphachannel pixmap - it will be used in
BitmapEx
diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx
b/canvas/source/cairo/cairo_canvasbitmap.hxx
index b1d669e..bef03f5 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.hxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.hxx
@@ -115,14 +115,14 @@ namespace cairocanvas
// 2nd the pixmap handle
// 3rd the pixmap depth
virtual ::com::sun::star::uno::Any SAL_CALL
getFastPropertyValue(sal_Int32 nHandle) throw
(::com::sun::star::uno
[Libreoffice-commits] core.git: filter/source
filter/source/pdf/impdialog.src |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 54e8623d73ace01e66735f70d8f9635e74eb9b25
Author: Andreas Mantke
Date: Mon Apr 1 16:23:10 2013 +0200
fdo#62890: Fix for the dialog PDF Options, register Digital Signatures
This patch changes the length of the fixed text field "Use this certificate
(...)"
because in some languages, e.g. German, the translation fits not into the
available
space.
It also changes for the same reason the width of the Select- and the
Clear-Button.
Change-Id: Ifbba3e40b27d96da4706c8dcdf4d9ab26069a83f
Reviewed-on: https://gerrit.libreoffice.org/3157
Reviewed-by: Björn Michaelsen
Tested-by: Björn Michaelsen
diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src
index 0155b07..8d74616 100644
--- a/filter/source/pdf/impdialog.src
+++ b/filter/source/pdf/impdialog.src
@@ -820,7 +820,7 @@ TabPage RID_PDF_TAB_SIGNING
FixedText FT_SIGN_CERT_TEXT
{
Pos = MAP_APPFONT( 6, 3 );
-Size = MAP_APPFONT( 200, 10 );
+Size = MAP_APPFONT( 250, 10 );
Text[ en-US ] = "Use this certificate to digitally sign PDF
documents:";
};
@@ -836,15 +836,15 @@ TabPage RID_PDF_TAB_SIGNING
{
TabStop = TRUE ;
Pos = MAP_APPFONT ( 130, 17 ) ;
-Size = MAP_APPFONT ( 30 , 13 ) ;
+Size = MAP_APPFONT ( 40 , 13 ) ;
Text[ en-US ] = "~Select...";
};
PushButton BTN_SIGN_CERT_CLEAR
{
TabStop = TRUE ;
-Pos = MAP_APPFONT ( 165, 17 ) ;
-Size = MAP_APPFONT ( 30 , 13 ) ;
+Pos = MAP_APPFONT ( 175, 17 ) ;
+Size = MAP_APPFONT ( 40 , 13 ) ;
Text[ en-US ] = "Clear";
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] remove -dylib_file mappings that are not needed anymore
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3192 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/3192/1 remove -dylib_file mappings that are not needed anymore XCode 2.5 (i.e. Mac OSX 10.4 & 10.5) couldn't find the libraries without explicit mapping, but as baseline is now 10.6, this wrapping is no longer necessary Change-Id: I225fc47b9ea4b1fb2b13ba575605cbdebc014fd8 --- M RepositoryExternal.mk M libxmlsec/ExternalProject_xmlsec.mk M odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile M odk/examples/DevelopersGuide/Components/CppComponent/Makefile M odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile M odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile M odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile M odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile M odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile M odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile M odk/examples/cpp/DocumentLoader/Makefile M odk/examples/cpp/complextoolbarcontrols/Makefile M odk/examples/cpp/counter/Makefile M odk/examples/cpp/remoteclient/Makefile M odk/settings/settings.mk M redland/ExternalProject_rasqal.mk M redland/ExternalProject_redland.mk D solenv/bin/macosx-dylib-link-list.pl M solenv/gbuild/platform/macosx.mk 19 files changed, 14 insertions(+), 126 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 295058f..1872c37 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -911,12 +911,6 @@ rdf \ ) -ifeq ($(OS),MACOSX) - -$(call gb_LinkTarget_add_libs,$(1),$(foreach replaceme,librasqal-lo.$(RASQAL_MAJOR) libraptor2-lo.$(RAPTOR_MAJOR),-dylib_file @loader_path/$(replaceme).dylib:$(gb_Library_OUTDIRLOCATION)/$(replaceme).dylib)) - -endif - endef else # ANDROID @@ -2243,7 +2237,6 @@ ) else ifeq ($(OS),MACOSX) $(call gb_LinkTarget_add_libs,$(1),\ - -dylib_file @loader_path/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython:$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__OOO/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython \ -F$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__OOO -framework LibreOfficePython \ ) else diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk index 70b5083..c82c5e2 100644 --- a/libxmlsec/ExternalProject_xmlsec.mk +++ b/libxmlsec/ExternalProject_xmlsec.mk @@ -59,7 +59,6 @@ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include" \ LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX FREEBSD,$(OS)),,-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib),\ - $(if $(filter-out MACOSX,$(OS)),,LDFLAGS="-Wl$(COMMA)-dylib_file$(COMMA)@executable_path/libnssutil3.dylib:$(OUTDIR)/lib/libnssutil3.dylib")) \ && $(MAKE) \ ) diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile index a65f6f6..ffd2765 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile @@ -82,7 +82,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS) $@ endif diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile index 34b6834..a681e1b 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile +++ b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile @@ -115,7 +115,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst /,$(PS),$@)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS) $@ endif @@ -183,7 +183,7 @@ $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHEL
[PATCH] use filelist install method for udkapi and offapi
Hello LibreOffice gerrit bot, Michael Stahl, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3152 to look at the new patch set (#9). Change subject: use filelist install method for udkapi and offapi .. use filelist install method for udkapi and offapi ... so we can drop ZipUnoApi again. Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa --- M instsetoo_native/util/openoffice.lst.in M offapi/UnoApi_offapi.mk M scp2/inc/macros.inc M scp2/source/sdkoo/sdkoo.scp M solenv/gbuild/Package.mk M solenv/gbuild/UnoApi.mk D solenv/gbuild/ZipUnoApi.mk M solenv/gbuild/gbuild.mk M solenv/gbuild/platform/IOS_ARM_GCC.mk M solenv/gbuild/platform/WNT_INTEL_GCC.mk M solenv/gbuild/platform/com_MSC_class.mk M solenv/gbuild/platform/macosx.mk M solenv/gbuild/platform/solaris.mk M solenv/gbuild/platform/unxgcc.mk M udkapi/UnoApi_udkapi.mk 15 files changed, 333 insertions(+), 326 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/3152/9 -- To view, visit https://gerrit.libreoffice.org/3152 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa Gerrit-PatchSet: 9 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon Gerrit-Reviewer: LibreOffice gerrit bot Gerrit-Reviewer: Michael Stahl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] unotools: remove some unused items
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3191 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/3191/1 unotools: remove some unused items Change-Id: I95bcac6a3ff8cf4644c9d1596c75cac2d9cd94fe --- M officecfg/registry/schema/org/openoffice/Office/Common.xcs M sfx2/source/appl/app.cxx M unotools/Library_utl.mk M unotools/Package_inc.mk D unotools/inc/unotools/accelcfg.hxx M unotools/inc/unotools/itemholderbase.hxx D unotools/inc/unotools/workingsetoptions.hxx M unotools/inc/unotools/xmlaccelcfg.hxx D unotools/source/config/accelcfg.cxx M unotools/source/config/itemholder1.cxx D unotools/source/config/workingsetoptions.cxx 11 files changed, 11 insertions(+), 740 deletions(-) diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 66e353c..f819ebe 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -3694,21 +3694,6 @@ - - - -Lists open documents or windows. - - - - - - - - Lists open documents or windows. - - - Contains settings specifying if a XML package is added to the diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 479f9d4..3b31dbd 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -113,7 +113,6 @@ #include #include #include -#include #include #include #include diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index d99c18b..dcef7a8 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -71,7 +71,6 @@ $(eval $(call gb_Library_add_exception_objects,utl,\ unotools/source/accessibility/accessiblerelationsethelper \ unotools/source/accessibility/accessiblestatesethelper \ -unotools/source/config/accelcfg \ unotools/source/config/bootstrap \ unotools/source/config/cmdoptions \ unotools/source/config/compatibility \ @@ -104,7 +103,6 @@ unotools/source/config/syslocaleoptions \ unotools/source/config/useroptions \ unotools/source/config/viewoptions \ -unotools/source/config/workingsetoptions \ unotools/source/config/xmlaccelcfg \ unotools/source/i18n/calendarwrapper \ unotools/source/i18n/caserotate \ diff --git a/unotools/Package_inc.mk b/unotools/Package_inc.mk index 92ec12e..1a47ec1 100644 --- a/unotools/Package_inc.mk +++ b/unotools/Package_inc.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Package_Package,unotools_inc,$(SRCDIR)/unotools/inc)) -$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/accelcfg.hxx,unotools/accelcfg.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/accessiblerelationsethelper.hxx,unotools/accessiblerelationsethelper.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/accessiblestatesethelper.hxx,unotools/accessiblestatesethelper.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/atom.hxx,unotools/atom.hxx)) @@ -96,7 +95,6 @@ $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/unotoolsdllapi.h,unotools/unotoolsdllapi.h)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/useroptions.hxx,unotools/useroptions.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/viewoptions.hxx,unotools/viewoptions.hxx)) -$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/workingsetoptions.hxx,unotools/workingsetoptions.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/xmlaccelcfg.hxx,unotools/xmlaccelcfg.hxx)) # vim: set noet sw=4 ts=4: diff --git a/unotools/inc/unotools/accelcfg.hxx b/unotools/inc/unotools/accelcfg.hxx deleted file mode 100644 index c60a4f0..000 --- a/unotools/inc/unotools/accelcfg.hxx +++ /dev/null @@ -1,65 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_unotools_ACCELCFG_HXX -#define INCLUDED_unotools_ACCELCFG_HXX - -#include -#in
[PATCH] use filelist install method for udkapi and offapi
Hello LibreOffice gerrit bot, Michael Stahl, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3152 to look at the new patch set (#8). Change subject: use filelist install method for udkapi and offapi .. use filelist install method for udkapi and offapi ... so we can drop ZipUnoApi again. Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa --- M instsetoo_native/util/openoffice.lst.in M offapi/UnoApi_offapi.mk M scp2/inc/macros.inc M scp2/source/sdkoo/sdkoo.scp M solenv/gbuild/Package.mk M solenv/gbuild/UnoApi.mk D solenv/gbuild/ZipUnoApi.mk M solenv/gbuild/gbuild.mk M solenv/gbuild/platform/IOS_ARM_GCC.mk M solenv/gbuild/platform/WNT_INTEL_GCC.mk M solenv/gbuild/platform/com_MSC_class.mk M solenv/gbuild/platform/macosx.mk M solenv/gbuild/platform/solaris.mk M solenv/gbuild/platform/unxgcc.mk M udkapi/UnoApi_udkapi.mk 15 files changed, 333 insertions(+), 326 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/3152/8 -- To view, visit https://gerrit.libreoffice.org/3152 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa Gerrit-PatchSet: 8 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon Gerrit-Reviewer: LibreOffice gerrit bot Gerrit-Reviewer: Michael Stahl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] revert back to usign autogen.sh cmdline arguments if given
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3190
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/90/3190/1
revert back to usign autogen.sh cmdline arguments if given
This is a partial revert of ca0c54d0fe3812cec64e5c7cc83309d4397f5e0a .
Ignoring cmdline arguments if autogen.* exists is broken for several reasons:
- autogen.sh of every other package passes cmdline arguments to configure
- that's because if I was bothered to give them, I want them used
- there's no reason to prefer autogen.input now, given that autogen.input
cannot be overwritten by autogen.sh, unlike autogen.lastrun , so there's
no accidental loss of the switches
- running autogen.sh --foo followed by autogen.sh --bar actually runs
configure with --foo the second time too, because the first one creates
autogen.lastrun and the second one first complains about the cmdline
args, then complains about autogen.lastrun, and then uses it
Change-Id: I5868610935d0312915be74602b6435eea069f937
---
M autogen.sh
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index f5960e3..2498c5a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -112,14 +112,14 @@
my $input = "autogen.input";
my $lastrun = "autogen.lastrun";
-if (-f $input) {
-warn "Ignoring command-line arguments, using $input.\n" if (@ARGV);
-warn "Ignoring $lastrun, using $input.\n" if (-f $lastrun);
-@cmdline_args = read_args ($input);
-} elsif (-f $lastrun) {
-warn "Ignoring command-line arguments, using $lastrun.\n" if (@ARGV);
-print STDERR "Reading $lastrun. Please rename it to $input to avoid this
message.\n";
-@cmdline_args = read_args ($lastrun);
+if (!@ARGV) {
+if (-f $input) {
+warn "Ignoring $lastrun, using $input.\n" if (-f $lastrun);
+@cmdline_args = read_args ($input);
+} elsif (-f $lastrun) {
+print STDERR "Reading $lastrun. Please rename it to $input to avoid
this message.\n";
+@cmdline_args = read_args ($lastrun);
+}
} else {
@cmdline_args = @ARGV;
}
--
To view, visit https://gerrit.libreoffice.org/3190
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5868610935d0312915be74602b6435eea069f937
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Luboš Luňák
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] use filelist install method for udkapi and offapi
Hello LibreOffice gerrit bot, Michael Stahl, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3152 to look at the new patch set (#7). Change subject: use filelist install method for udkapi and offapi .. use filelist install method for udkapi and offapi ... so we can drop ZipUnoApi again. Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa --- M instsetoo_native/util/openoffice.lst.in M offapi/UnoApi_offapi.mk M scp2/inc/macros.inc M scp2/source/sdkoo/sdkoo.scp M solenv/gbuild/Package.mk M solenv/gbuild/UnoApi.mk D solenv/gbuild/ZipUnoApi.mk M solenv/gbuild/gbuild.mk M solenv/gbuild/platform/IOS_ARM_GCC.mk M solenv/gbuild/platform/WNT_INTEL_GCC.mk M solenv/gbuild/platform/com_MSC_class.mk M solenv/gbuild/platform/macosx.mk M solenv/gbuild/platform/solaris.mk M solenv/gbuild/platform/unxgcc.mk M udkapi/UnoApi_udkapi.mk 15 files changed, 333 insertions(+), 326 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/3152/7 -- To view, visit https://gerrit.libreoffice.org/3152 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa Gerrit-PatchSet: 7 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon Gerrit-Reviewer: LibreOffice gerrit bot Gerrit-Reviewer: Michael Stahl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] allow Package to install to other dir than $OUTDIR
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3189
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/89/3189/1
allow Package to install to other dir than $OUTDIR
This is preparatory work for creating installation directly by gbuild.
Change-Id: I1b11db37c76ff781731845650169f39cb78fe820
---
M config_host.mk.in
M configure.ac
M solenv/gbuild/Package.mk
M solenv/gbuild/TargetLocations.mk
4 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/config_host.mk.in b/config_host.mk.in
index 08fc52c9..48f9006 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -248,6 +248,7 @@
export ILIB=@ILIB@
export INPATH=@INPATH@
export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@
+export INSTDIR=@INSTDIR@
export INSTALLDIR=@INSTALLDIR@
export INSTALLDIRNAME=@INSTALLDIRNAME@
export INTRO_BITMAP=@INTRO_BITMAP@
diff --git a/configure.ac b/configure.ac
index 66a5966..37197df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3967,11 +3967,14 @@
# IsValidFilePath in /sal/osl/w32/file_url.cxx rejects "X:\\" breaking idlc
if echo ${formatted_path} | $GREP -q '/$'; then
WORKDIR=${formatted_path}workdir/${INPATH}
+INSTDIR=${formatted_path}instdir/${INPATH}
else
WORKDIR=${formatted_path}/workdir/${INPATH}
+INSTDIR=${formatted_path}/instdir/${INPATH}
fi
else
WORKDIR=${BUILDDIR}/workdir/${INPATH}
+INSTDIR=${BUILDDIR}/instdir/${INPATH}
fi
OUTDIR="${SOLARVER}/${INPATH}"
SOLARINC="-I. -I${SOLARVER}/$INPATH/inc/external -I${SOLARVER}/$INPATH/inc
-I$SRC_ROOT/solenv/inc $SOLARINC"
@@ -3984,6 +3987,7 @@
AC_SUBST(GUI)
AC_SUBST(GUIBASE)
AC_SUBST(INPATH)
+AC_SUBST([INSTDIR])
AC_SUBST(OS)
AC_SUBST(OUTDIR)
AC_SUBST(OUTPATH)
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 6642a89..c239897 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -44,10 +44,13 @@
$(foreach destination,$(call gb_PackagePart_get_destinations),$(eval \
$(call gb_PackagePart__rule,$(destination
+# Deliver one file to the output dir.
+#
+# gb_PackagePart_PackagePart destfile source prep-target outdir
define gb_PackagePart_PackagePart
-$(OUTDIR)/$(1) : $(2) | $(dir $(OUTDIR)/$(1)).dir
+$(4)/$(1) : $(2) | $(dir $(4)/$(1)).dir
$(2) :| $(3)
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/$(1),$(2),$(3))
+$(call gb_Deliver_add_deliverable,$(4)/$(1),$(2),$(3))
endef
@@ -70,6 +73,7 @@
# for other targets that want to create Packages, does not register at Module
define gb_Package_Package_internal
gb_Package_SOURCEDIR_$(1) := $(2)
+gb_Package_OUTDIR_$(1) := $(OUTDIR)
$(call gb_Package_get_clean_target,$(1)) : FILES := $(call
gb_Package_get_target,$(1)) $(call gb_Package_get_preparation_target,$(1))
$(call gb_Package_get_target,$(1)) : $(call
gb_Package_get_preparation_target,$(1))
@@ -83,10 +87,20 @@
endef
+# Set output dir for the package files.
+#
+# Default is $(OUTDIR).
+#
+# gb_Package_set_outdir package outdir
+define gb_Package_set_outdir
+gb_Package_OUTDIR_$(1) := $(2)
+
+endef
+
define gb_Package_add_file
-$(call gb_Package_get_target,$(1)) : $(OUTDIR)/$(2)
-$(call gb_Package_get_clean_target,$(1)) : FILES += $(OUTDIR)/$(2)
-$(call
gb_PackagePart_PackagePart,$(2),$$(gb_Package_SOURCEDIR_$(1))/$(3),$(call
gb_Package_get_preparation_target,$(1)))
+$(call gb_Package_get_target,$(1)) : $$(gb_Package_OUTDIR_$(1))/$(2)
+$(call gb_Package_get_clean_target,$(1)) : FILES +=
$$(gb_Package_OUTDIR_$(1))/$(2)
+$(call
gb_PackagePart_PackagePart,$(2),$$(gb_Package_SOURCEDIR_$(1))/$(3),$(call
gb_Package_get_preparation_target,$(1)),$$(gb_Package_OUTDIR_$(1)))
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index b738b65..a8cf8a4 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -39,6 +39,7 @@
gb_HelpTarget_get_outdir_target = $(OUTDIR)/pck/$(1).zip
gb_Pagein_get_outdir_target = $(OUTDIR)/bin/pagein-$(1)
gb_PackagePart_get_destinations = \
+ $(INSTDIR) \
$(OUTDIR)/bin \
$(OUTDIR)/inc \
$(OUTDIR)/lib \
--
To view, visit https://gerrit.libreoffice.org/3189
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b11db37c76ff781731845650169f39cb78fe820
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LibreOffice-SDK for MinGW
Hi Helmar, Helmar Spangenberg píše v Po 01. 04. 2013 v 13:20 +0200: > is it possible to create the sdk package on the nightly builds for MinGW? > > On my system (SuSE 12.3 / x86-64) with the actual mingw packages I run into > big problems. > To get LO compiled I had to do some code adjustments (in case you are > interested, I will send them later); I managed to get the compiled LO run > under wine and windows. However, the sdk worked only as long as I did not > contact LO, it seems that there are some problems transfering the control > structures to the environment. Oh wow, you are brave! :-) I guess nobody yet got that far that he / she would try to build the SDK & even use that for something useful. > I suspect, the MinGW threads in my environment do something horrible to the > data;in a debug session I can see, something probably reasonable is > transferred, but later, trying to use the data, ends aup with a crash. > I mean "reasonable" since it was once possible to control LO remotely - I > must > have had a constellation of the memory which kept the structures untouched. > But as soon I changed the code adding functions or other stuff, everything > crashed. So far the MinGW build is still a very experimental thing; I mostly use that when I develop something Windows-only because I can still keep my workflow, but as the binaries built with the MinGW SDK will be incompatible with the LibreOffice release builds, I am not sure it makes much sense to invest effort in that at this stage. But probably you have same special need why you are doing this - can you please tell me what is your goal? Either way - thanks for looking into this! :-) All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dev-tools.git: 2 commits - scripts/download-stats.pl
scripts/download-stats.pl | 905 +-
1 file changed, 501 insertions(+), 404 deletions(-)
New commits:
commit c78dcc2843b733c7ff237dea178d7599f9d1f730
Author: Michael Meeks
Date: Wed Apr 3 16:42:47 2013 +0100
add apache log analysis tool to generate download stats.
Kendy wrote at least the hardest half.
diff --git a/scripts/download-stats.pl b/scripts/download-stats.pl
new file mode 100755
index 000..3e128e0
--- /dev/null
+++ b/scripts/download-stats.pl
@@ -0,0 +1,801 @@
+#!/usr/bin/perl -w
+
+use strict;
+use threads ('yield',
+'stack_size' => 64*4096,
+'exit' => 'threads_only',
+'stringify');
+use POSIX qw(strftime);
+
+my $verbose = 0;
+my $rsync_first = 0;
+my $cpus_to_use = 32;# level of parallelism
+my $bzcat_grouping = 10; # files to pass to bzcat at once
+my $path_to_log_tree;
+my $threaded = 1;
+
+my %month_to_num = (
+'Jan' => '01',
+'Feb' => '02',
+'Mar' => '03',
+'Apr' => '04',
+'May' => '05',
+'Jun' => '06',
+'Jul' => '07',
+'Aug' => '08',
+'Sep' => '09',
+'Oct' => '10',
+'Nov' => '11',
+'Dec' => '12',
+);
+
+my %products;
+my %allversions;
+my %all_files_list;
+my %date_product_count;
+my %date_version_count;
+my $total_downloads;
+
+# FIXME: ODF is -incredibly- lame in this regard ... we badly want R1C1 style
referencing here [!]
+sub coltoref($)
+{
+my $col = shift;
+die ("odff needs R1C1") if ($col > 25);
+return chr (ord('A') + $col);
+}
+
+sub print_date_cell($$)
+{
+my ($style,$date) = @_;
+# sadly not truly a date but a year + ISO week number.
+print << "EOF"
+
+ $date
+
+EOF
+;
+}
+
+sub find_logs($);
+sub find_logs($)
+{
+my $path = shift;
+my $dirh;
+my @logfiles;
+
+if (-f $path ) {
+ if ($path =~ m/documentfoundation\.org.*access_log/) {
+ if ($verbose) {
+ print STDERR "hit: $path\n";
+ }
+ return $path;
+ } else {
+ return;
+ }
+}
+
+opendir ($dirh, $path) || die "can't open '$path': $!";
+while (my $name = readdir ($dirh)) {
+ next if ($name =~ m/^\./);
+ push @logfiles, find_logs("$path/$name");
+}
+close ($dirh);
+
+return @logfiles;
+}
+
+sub is_uninteresting_file($)
+{
+my $file = shift;
+
+return 1 if ( $file =~ /^$/ );
+return 1 if ( $file =~ /^{/ );
+return 1 if ( $file =~ /^%/ );
+return 1 if ( $file =~ /^debian-repo\/testing\// );
+return 1 if ( $file =~ /^\/libreoffice\/old\// );
+return 1 if ( $file =~ /^\/libreoffice\/src\// );
+return 1 if ( $file =~ /^\/robots\.txt$/ );
+return 1 if ( $file =~ /\/index\.php$/ );
+return 1 if ( $file =~ /\/a\.sh$/ );
+return 1 if ( $file =~ /^\/TIMESTAMP/ );
+
+# ignore source
+return 1 if ( $file =~ m|/src/| );
+
+# ignore android remote
+return 1 if ( $file =~ m/ImpressRemote.apk$/ );
+
+# anywhere
+return 1 if ( $file =~ /\/customer_testimonials.php/ );
+
+# anything that is missing an extension (directory names, metafiles) and
slash
+return 1 if ( $file =~ /\/[^.\/]+$/ );
+return 1 if ( $file =~ /^[^\/]+$/ );
+
+# not interesting extensions
+return 1 if ( $file =~ /\/$/ );
+return 1 if ( $file =~ /\?C=[MNS];O=[AD]$/ );
+return 1 if ( $file =~ /\.asc$/ );
+return 1 if ( $file =~ /\.btih$/ );
+return 1 if ( $file =~ /\.css$/ );
+return 1 if ( $file =~ /\/favicon\.ico$/ );
+return 1 if ( $file =~ /\.gif$/ );
+return 1 if ( $file =~ /\.gpg$/ );
+return 1 if ( $file =~ /\.html$/ );
+return 1 if ( $file =~ /\.info\.php$/ );
+return 1 if ( $file =~ /\.log$/ );
+return 1 if ( $file =~ /\.magnet$/ );
+return 1 if ( $file =~ /\.md5$/ );
+return 1 if ( $file =~ /\.meta4$/ );
+return 1 if ( $file =~ /\.metalink$/ );
+return 1 if ( $file =~ /\.mirrorlist$/ );
+return 1 if ( $file =~ /\/Packages$/ );
+return 1 if ( $file =~ /\/Packages\.bz2$/ );
+return 1 if ( $file =~ /\/Packages\.gz$/ );
+return 1 if ( $file =~ /\/Packages\.lzma$/ );
+return 1 if ( $file =~ /\/Packages\.xz$/ );
+return 1 if ( $file =~ /\.png$/ );
+return 1 if ( $file =~ /\/Release$/ );
+return 1 if ( $file =~ /\.sha1$/ );
+return 1 if ( $file =~ /\.sha256$/ );
+return 1 if ( $file =~ /\.torrent$/ );
+return 1 if ( $file =~ /\.zsync$/ );
+
+# noise
+return 1 if ( $file =~ /%/ );
+return 1 if ( $file =~ /&/ );
+
+# is interesting ...
+return 0;
+}
+
+sub characterise($$)
+{
+my ($filerec, $file) = @_;
+
+# currently based entirely on the filename
+$file =~ m|/([^/]+)$| || die "not a filename: '$file'";
+my $name = $1;
+
+$name =~ s/BrOffice/LibO/; # BrOffice is obsolete
+$name =~ s/-/_/g; # use underscores everywhere
+
+my @elements = split(/_/, $name);
+
+if (@elements < 2) {
+ print STDERR "Un
[Libreoffice-commits] core.git: 3 commits - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo51916.rtf | 319 +
sw/qa/extras/rtfimport/rtfimport.cxx |7
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 21 +
writerfilter/source/rtftok/rtfdocumentimpl.hxx |3
4 files changed, 345 insertions(+), 5 deletions(-)
New commits:
commit 008275d56f9ac5248f0e94f606671b4c1993ca20
Author: Miklos Vajna
Date: Wed Apr 3 17:36:26 2013 +0200
fdo#51916 out of bounds substring access
Change-Id: I7db46ef17b8aed443faa7eb0c13b6ba109242cc1
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 0714b15..d10a5a0 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3940,11 +3940,14 @@ int RTFDocumentImpl::popState()
// extract default text
nLength = aStr.toChar();
aStr = aStr.copy(1);
-OString aDefaultText = aStr.copy(0, nLength);
RTFValue::Pointer_t pNValue(new
RTFValue(OStringToOUString(aName, aState.nCurrentEncoding)));
m_aFormfieldSprms.set(NS_ooxml::LN_CT_FFData_name, pNValue);
-RTFValue::Pointer_t pDValue(new
RTFValue(OStringToOUString(aDefaultText, aState.nCurrentEncoding)));
-m_aFormfieldSprms.set(NS_ooxml::LN_CT_FFTextInput_default,
pDValue);
+if (nLength > 0)
+{
+OString aDefaultText = aStr.copy(0, nLength);
+RTFValue::Pointer_t pDValue(new
RTFValue(OStringToOUString(aDefaultText, aState.nCurrentEncoding)));
+m_aFormfieldSprms.set(NS_ooxml::LN_CT_FFTextInput_default,
pDValue);
+}
m_bFormField = false;
}
commit 7006ef460bb68d27a74381fab7b8826b786b31c6
Author: Miklos Vajna
Date: Wed Apr 3 17:28:42 2013 +0200
fdo#51916 testcase
Change-Id: I27ffbab64cfb6763235d4dfd7fb47aa98235274d
diff --git a/sw/qa/extras/rtfimport/data/fdo51916.rtf
b/sw/qa/extras/rtfimport/data/fdo51916.rtf
new file mode 100644
index 000..b2359c3
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo51916.rtf
@@ -0,0 +1,319 @@
+{\rtf1
+{\fonttbl
+{\f0\fbidi \froman\fcharset238\fprq2
+{\*\panose 02020603050405020304}
+Times New Roman;}
+{\f34\fbidi \froman\fcharset238\fprq2
+{\*\panose 02040503050406030204}
+Cambria Math;}
+{\f37\fbidi \fswiss\fcharset238\fprq2
+{\*\panose 020f0502020204030204}
+Calibri
+{\*\falt Century Gothic}
+;}
+{\f38\fbidi \fswiss\fcharset238\fprq2
+{\*\panose 020b0604030504040204}
+Tahoma;}
+{\flomajor\f31500\fbidi \froman\fcharset238\fprq2
+{\*\panose 02020603050405020304}
+Times New Roman;}
+{\fdbmajor\f31501\fbidi \froman\fcharset238\fprq2
+{\*\panose 02020603050405020304}
+Times New Roman;}
+{\fhimajor\f31502\fbidi \froman\fcharset238\fprq2
+{\*\panose 02040503050406030204}
+Cambria;}
+{\fbimajor\f31503\fbidi \froman\fcharset238\fprq2
+{\*\panose 02020603050405020304}
+Times New Roman;}
+{\flominor\f31504\fbidi \froman\fcharset238\fprq2
+{\*\panose 02020603050405020304}
+Times New Roman;}
+{\fdbminor\f31505\fbidi \froman\fcharset238\fprq2
+{\*\panose 02020603050405020304}
+Times New Roman;}
+{\fhiminor\f31506\fbidi \fswiss\fcharset238\fprq2
+{\*\panose 020f0502020204030204}
+Calibri
+{\*\falt Century Gothic}
+;}
+{\fbiminor\f31507\fbidi \froman\fcharset238\fprq2
+{\*\panose 02020603050405020304}
+Times New Roman;}
+{\f297\fbidi \froman\fcharset0\fprq2 Times New Roman;}
+{\f296\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\f298\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\f299\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\f300\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\f301\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\f302\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\f303\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\f637\fbidi \froman\fcharset0\fprq2 Cambria Math;}
+{\f636\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}
+{\f638\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}
+{\f639\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}
+{\f642\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}
+{\f643\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);}
+{\f667\fbidi \fswiss\fcharset0\fprq2 Calibri
+{\*\falt Century Gothic}
+;}
+{\f666\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr
+{\*\falt Century Gothic}
+;}
+{\f668\fbidi \fswiss\fcharset161\fprq2 Calibri Greek
+{\*\falt Century Gothic}
+;}
+{\f669\fbidi \fswiss\fcharset162\fprq2 Calibri Tur
+{\*\falt Century Gothic}
+;}
+{\f672\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic
+{\*\falt Century Gothic}
+;}
+{\f673\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese)
+{\*\falt Century Gothic}
+;}
+{\f677\fbidi \fswiss\fcharset0\fprq2 Tahoma;}
+{\f676\fbidi \fswiss\fcharset204\fprq2 Tahoma Cyr;}
+{\f679\fbidi \fswiss\fcharset162\fprq2 Tahom
[PATCH libreoffice-4-0] Resolves: fdo#61241 background style dialog too small
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3188 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/3188/1 Resolves: fdo#61241 background style dialog too small (cherry picked from commit 1ccbb620946c7032c57054550b08ad5362fe1c3f) Conflicts: vcl/source/control/tabctrl.cxx vcl/source/window/tabpage.cxx Change-Id: Ie7396b63a64e89bb7aa7c0e284faab7ed380c4c1 --- M vcl/source/control/tabctrl.cxx M vcl/source/window/tabpage.cxx 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 4e1afc2..19163f1 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -29,6 +29,7 @@ #include "vcl/tabpage.hxx" #include "vcl/tabctrl.hxx" #include "vcl/controllayout.hxx" +#include "vcl/layout.hxx" #include "vcl/lstbox.hxx" #include "controldata.hxx" @@ -2179,7 +2180,7 @@ if (!pPage) continue; -Size aPageSize(pPage->GetOptimalSize(WINDOWSIZE_PREFERRED)); +Size aPageSize(VclContainer::getLayoutRequisition(*pPage)); if (aPageSize.Width() > aOptimalPageSize.Width()) aOptimalPageSize.Width() = aPageSize.Width(); diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index 3546c4f..d3b1f34 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -222,7 +222,7 @@ return Window::GetOptimalSize(eType); Size aSize; if (isLayoutEnabled()) -aSize = GetWindow(WINDOW_FIRSTCHILD)->GetOptimalSize(eType); +aSize = VclContainer::getLayoutRequisition(*GetWindow(WINDOW_FIRSTCHILD)); else aSize = getLegacyBestSizeForChildren(*this); return Window::CalcWindowSize(aSize); -- To view, visit https://gerrit.libreoffice.org/3188 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie7396b63a64e89bb7aa7c0e284faab7ed380c4c1 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Caolán McNamara ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] use filelist install method for udkapi and offapi
Hello LibreOffice gerrit bot, Michael Stahl, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3152 to look at the new patch set (#6). Change subject: use filelist install method for udkapi and offapi .. use filelist install method for udkapi and offapi ... so we can drop ZipUnoApi again. Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa --- M instsetoo_native/util/openoffice.lst.in M offapi/UnoApi_offapi.mk M scp2/inc/macros.inc M scp2/source/sdkoo/sdkoo.scp M solenv/gbuild/Package.mk M solenv/gbuild/UnoApi.mk D solenv/gbuild/ZipUnoApi.mk M solenv/gbuild/gbuild.mk M solenv/gbuild/platform/IOS_ARM_GCC.mk M solenv/gbuild/platform/WNT_INTEL_GCC.mk M solenv/gbuild/platform/com_MSC_class.mk M solenv/gbuild/platform/macosx.mk M solenv/gbuild/platform/solaris.mk M solenv/gbuild/platform/unxgcc.mk M udkapi/UnoApi_udkapi.mk 15 files changed, 332 insertions(+), 326 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/3152/6 -- To view, visit https://gerrit.libreoffice.org/3152 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon Gerrit-Reviewer: LibreOffice gerrit bot Gerrit-Reviewer: Michael Stahl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix fdo#40496: don't reset RES_FRAMEDIR attribute.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3182 Approvals: Lior Kaplan: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3182 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2aec9391d076af6d5fbf00ba5bdad030ac0286ed Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: navin patidar Gerrit-Reviewer: Lior Kaplan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/ui/shells/textsh1.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit d0cfbb882c4c00fea4858f9d4b2511df66dd087b Author: navin patidar Date: Wed Apr 3 11:51:40 2013 +0300 fix fdo#40496: don't reset RES_FRAMEDIR attribute. fix regression introduced by bb920862c02047471f0ac5e78358e8d8fd9b93e7 commit discussed here : https://bugs.freedesktop.org/show_bug.cgi?id=40496#c13 choosing correct default alignment for RTL text need some discussion. Change-Id: I2aec9391d076af6d5fbf00ba5bdad030ac0286ed Reviewed-on: https://gerrit.libreoffice.org/3182 Reviewed-by: Lior Kaplan Tested-by: Lior Kaplan diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 395c7d8..e92cde6 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -499,9 +499,8 @@ void SwTextShell::Execute(SfxRequest &rReq) aAttribs.insert( aAttribs.end(), nE++ ); pUShorts += 2; } -// we don't want to change writing direction and text alignment. +// we don't want to change writing direction. aAttribs.erase( RES_FRAMEDIR ); -aAttribs.erase( RES_PARATR_ADJUST ); rWrtSh.ResetAttr( aAttribs ); rReq.Done(); break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRTypes.h |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0e4bfab2ba604759db7933604bb5fbae5a41bc6e
Author: Fridrich Å trba
Date: Wed Apr 3 15:55:09 2013 +0200
Override the encoding if fontId or encoding is set
diff --git a/src/lib/CDRTypes.h b/src/lib/CDRTypes.h
index c8cb533..ae5c1e9 100644
--- a/src/lib/CDRTypes.h
+++ b/src/lib/CDRTypes.h
@@ -166,7 +166,7 @@ struct CDRCharacterStyle
m_leftIndent(leftIndent), m_firstIndent(firstIndent),
m_rightIndent(rightIndent) {}
void overrideCharacterStyle(const CDRCharacterStyle &override)
{
-if (override.m_charSet)
+if (override.m_charSet || override.m_fontId)
m_charSet = override.m_charSet;
if (override.m_fontId)
m_fontId = override.m_fontId;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/docnode/ndtbl.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 4c16e415d9cc17405256c9c4eebdb6c908308867
Author: Jan Holesovsky
Date: Wed Apr 3 15:48:02 2013 +0200
sal_Bool -> bool.
Change-Id: Ie23ba9e2635d2dee8ad311df956b30e62e76935e
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 398dd6a..95237af 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -4028,8 +4028,8 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool
bCallUpdate )
SwTableBoxFmt* pBoxFmt = (SwTableBoxFmt*)rBox.GetFrmFmt();
SfxItemSet aBoxSet( GetAttrPool(), RES_BOXATR_FORMAT,
RES_BOXATR_VALUE );
-sal_Bool bLockModify = sal_True;
-sal_Bool bSetNumFmt = sal_False;
+bool bLockModify = true;
+bool bSetNumberFormat = false;
const bool bForceNumberFormat = IsInsTblFormatNum() &&
IsInsTblChangeNumFormat();
// if the user forced a number format in this cell previously,
@@ -4046,17 +4046,17 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool
bCallUpdate )
// Current and specified NumFormat match
// -> keep old Format
nFmtIdx = nOldNumFmt;
-bSetNumFmt = sal_True;
+bSetNumberFormat = true;
}
else
{
// Current and specified NumFormat do not match
// -> insert as Text
-bLockModify = bSetNumFmt = sal_False;
+bLockModify = bSetNumberFormat = false;
}
}
-if( bSetNumFmt || bForceNumberFormat )
+if( bSetNumberFormat || bForceNumberFormat )
{
pBoxFmt = (SwTableBoxFmt*)rBox.ClaimFrmFmt();
@@ -4066,7 +4066,7 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool
bCallUpdate )
// It's not enough to only reset the Formula.
// Make sure that the Text is formatted accordingly
-if( !bSetNumFmt && !bIsEmptyTxtNd && pNumFmtItem )
+if( !bSetNumberFormat && !bIsEmptyTxtNd && pNumFmtItem )
{
// Just resetting Attributes is not enough
// Make sure that the Text is formatted accordingly
@@ -4077,7 +4077,7 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool
bCallUpdate )
pBoxFmt->ResetFmtAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
if( bLockModify ) pBoxFmt->UnlockModify();
-if( bSetNumFmt )
+if( bSetNumberFormat )
pBoxFmt->SetFmtAttr( aBoxSet );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] Keep semantics, but improve readibility.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3186 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3186 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I32c18cb7b080f4847118a2d7e8d77dcd2bbce308 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Jan Holesovsky Gerrit-Reviewer: Miklos Vajna Gerrit-Reviewer: Thomas Arnhold ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 91/32d443db306a1d36105269f2b0c805dd1ebb6d
91/32d443db306a1d36105269f2b0c805dd1ebb6d |1 + 1 file changed, 1 insertion(+) New commits: commit ff5e6b669ae41557362f39b5669235746ba00be5 Author: Caolán McNamara Date: Wed Apr 3 14:48:10 2013 +0100 Notes added by 'git notes add' diff --git a/91/32d443db306a1d36105269f2b0c805dd1ebb6d b/91/32d443db306a1d36105269f2b0c805dd1ebb6d new file mode 100644 index 000..5dafb9c --- /dev/null +++ b/91/32d443db306a1d36105269f2b0c805dd1ebb6d @@ -0,0 +1 @@ +prefer: d72a0b5c618a37b70ba4d111b457deefad8f025f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source
sw/source/core/docnode/ndtbl.cxx | 51 ++-
1 file changed, 24 insertions(+), 27 deletions(-)
New commits:
commit 715323ece4c1c96714f6de51f98f5c58f30e5147
Author: Jan Holesovsky
Date: Wed Apr 3 11:44:28 2013 +0200
Keep semantics, but improve readibility.
Change-Id: I32c18cb7b080f4847118a2d7e8d77dcd2bbce308
Reviewed-on: https://gerrit.libreoffice.org/3186
Reviewed-by: Thomas Arnhold
Tested-by: Thomas Arnhold
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 252ac7f..08b710a 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -4022,39 +4022,36 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool
bCallUpdate )
SwTableBoxFmt* pBoxFmt = (SwTableBoxFmt*)rBox.GetFrmFmt();
SfxItemSet aBoxSet( GetAttrPool(), RES_BOXATR_FORMAT,
RES_BOXATR_VALUE );
-sal_Bool bSetNumFmt = IsInsTblFormatNum(), bLockModify = sal_True;
-if( bSetNumFmt )
+sal_Bool bSetNumFmt = IsInsTblFormatNum();
+sal_Bool bLockModify = sal_True;
+
+if( bSetNumFmt && !IsInsTblChangeNumFormat() )
{
-if( !IsInsTblChangeNumFormat() )
+if( !pNumFmtItem )
+bSetNumFmt = sal_False;
+else
{
-if( !pNumFmtItem )
-bSetNumFmt = sal_False;
+sal_uLong nOldNumFmt =
((SwTblBoxNumFormat*)pNumFmtItem)->GetValue();
+SvNumberFormatter* pNumFmtr = GetNumberFormatter();
+
+short nFmtType = pNumFmtr->GetType( nFmtIdx );
+if( nFmtType == pNumFmtr->GetType( nOldNumFmt ) ||
NUMBERFORMAT_NUMBER == nFmtType )
+// Current and specified NumFormat match
+// -> keep old Format
+nFmtIdx = nOldNumFmt;
else
-{
-sal_uLong nOldNumFmt =
((SwTblBoxNumFormat*)pNumFmtItem)->
-GetValue();
-SvNumberFormatter* pNumFmtr = GetNumberFormatter();
-
-short nFmtType = pNumFmtr->GetType( nFmtIdx );
-if( nFmtType == pNumFmtr->GetType( nOldNumFmt ) ||
-NUMBERFORMAT_NUMBER == nFmtType )
-// Current and specified NumFormat match
-// -> keep old Format
-nFmtIdx = nOldNumFmt;
-else
-// Current and specified NumFormat do not match
-// -> insert as Text
-bLockModify = bSetNumFmt = sal_False;
-}
+// Current and specified NumFormat do not match
+// -> insert as Text
+bLockModify = bSetNumFmt = sal_False;
}
+}
-if( bSetNumFmt )
-{
-pBoxFmt = (SwTableBoxFmt*)rBox.ClaimFrmFmt();
+if( bSetNumFmt )
+{
+pBoxFmt = (SwTableBoxFmt*)rBox.ClaimFrmFmt();
-aBoxSet.Put( SwTblBoxValue( fNumber ));
-aBoxSet.Put( SwTblBoxNumFormat( nFmtIdx ));
-}
+aBoxSet.Put( SwTblBoxValue( fNumber ));
+aBoxSet.Put( SwTblBoxNumFormat( nFmtIdx ));
}
// It's not enough to only reset the Formula.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapperTableHandler.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c2006fb823985c560404b0060ffe88810aa1d52f
Author: Michael Stahl
Date: Wed Apr 3 15:43:44 2013 +0200
writerfilter: fix silly init causing trivial STL assertion in test
(regression from 35b75ed510f49ff64cd86b38e228c2b5b9a9f3fc)
Change-Id: I4342fd619f4d1f760b8fef2594a67b9fb7cd8f0e
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 6a0609b..495165b 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -362,8 +362,8 @@ TableStyleSheetEntry *
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
}
}
-PropertyMap::iterator aTblLookIter =
-aTblLookIter = m_aTableProperties->find( PropertyDefinition(
PROP_TBL_LOOK, false ) );
+PropertyMap::iterator const aTblLookIter =
+m_aTableProperties->find(PropertyDefinition(PROP_TBL_LOOK, false));
if(aTblLookIter != m_aTableProperties->end())
{
aTblLookIter->second >>= rInfo.nTblLook;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/StyleSheetTable.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1a61682bca23670a59e13ca6b46b27ca4a24e48d
Author: Michael Stahl
Date: Wed Apr 3 15:32:42 2013 +0200
writerfilter: -Werror=sign-compare
Change-Id: I3fd0dfee676e511fb882d46729c214fbab525651
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 2a216fe..7fac285 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -240,7 +240,7 @@ PropertyMapPtr
TableStyleSheetEntry::GetLocalPropertiesFromMask( sal_Int32 nMask
// Get the properties applying according to the mask
PropertyMapPtr pProps( new PropertyMap( ) );
-for( int i = 0; i < sizeof( aOrderedStyleTable ); i++ )
+for (size_t i = 0; i < sizeof(aOrderedStyleTable); ++i)
{
TblStylePrs::iterator pIt = m_aStyles.find( aOrderedStyleTable[ i
].type );
if ( ( nMask & aOrderedStyleTable[ i ].mask ) && ( pIt !=
m_aStyles.end( ) ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UI_cui.mk
cui/AllLangResTarget_cui.mk|1
cui/UI_cui.mk |1
cui/source/inc/helpid.hrc |1
cui/source/options/optupdt.cxx | 141 +++--
cui/source/options/optupdt.hrc | 42 -
cui/source/options/optupdt.hxx | 23 +-
cui/source/options/optupdt.src | 111 -
cui/uiconfig/ui/hyphenate.ui |5
cui/uiconfig/ui/optonlineupdatepage.ui | 269 +
9 files changed, 340 insertions(+), 254 deletions(-)
New commits:
commit 2409c4b291f720a1c607bd0dfdf5986f396a045c
Author: Honza Minarik
Date: Wed Apr 3 11:13:38 2013 +0100
Resolves: fdo#60663: Adapt hyphenation dialog to HIG
Change-Id: I1a67a73e6dc6b26bdb84f0594d84a1f5d7e2bca2
diff --git a/cui/uiconfig/ui/hyphenate.ui b/cui/uiconfig/ui/hyphenate.ui
index a859275..26818c6 100644
--- a/cui/uiconfig/ui/hyphenate.ui
+++ b/cui/uiconfig/ui/hyphenate.ui
@@ -17,7 +17,7 @@
False
end
-
+
gtk-help
True
True
@@ -69,7 +69,6 @@
True
False
-18
True
6
6
@@ -195,7 +194,7 @@
- button1
+ help
hyphall
close
commit 1b6afe078844b8deb08c15501adebf6e4a5421b3
Author: Caolán McNamara
Date: Wed Apr 3 09:26:26 2013 +0100
convert online updates page to .ui
Change-Id: I69e8a1d136df3f8f8daa2d3f5241b74d2b39efdd
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index bcf726e..6a806b1 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -92,7 +92,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/options/optlingu.src \
cui/source/options/optpath.src \
cui/source/options/optsave.src \
-cui/source/options/optupdt.src \
cui/source/options/readonlyimage.src \
cui/source/options/treeopt.src \
cui/source/tabpages/align.src \
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
index ba28866..3220a15 100644
--- a/cui/UI_cui.mk
+++ b/cui/UI_cui.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/optfontspage \
cui/uiconfig/ui/optgeneralpage \
cui/uiconfig/ui/optmemorypage \
+ cui/uiconfig/ui/optonlineupdatepage \
cui/uiconfig/ui/optpathspage \
cui/uiconfig/ui/optsavepage \
cui/uiconfig/ui/optsecuritypage \
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 31e3d85..e4204c7 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -43,7 +43,6 @@
#define HID_OPTIONS_JAVA_CLASSPATH "CUI_HID_OPTIONS_JAVA_CLASSPATH"
#define HID_SVXPAGE_JSEARCH_OPTIONS "CUI_HID_SVXPAGE_JSEARCH_OPTIONS"
#define HID_SVXDLG_FILTER_WARNING "CUI_HID_SVXDLG_FILTER_WARNING"
-#define HID_SVX_OPTIONS_ONLINEUPDATE "CUI_HID_SVX_OPTIONS_ONLINEUPDATE"
#define HID_OFADLG_OPTIONS_TREE "CUI_HID_OFADLG_OPTIONS_TREE"
#define HID_OFA_CONNPOOL_DRIVERLIST "CUI_HID_OFA_CONNPOOL_DRIVERLIST"
#define UID_OFA_CONNPOOL_DRIVERLIST_BACK "CUI_UID_OFA_CONNPOOL_DRIVERLIST_BACK"
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 3475b56..375a8d3 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -21,7 +21,6 @@
#include
#include
#include "optupdt.hxx"
-#include "optupdt.hrc"
#include
#include
#include
@@ -43,27 +42,24 @@ using namespace ::com::sun::star;
// class SvxOnlineUpdateTabPage
--
-SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage( Window* pParent, const
SfxItemSet& rSet ) :
-
-SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_ONLINEUPDATE ), rSet ),
-m_aOptionsLine( this, CUI_RES( FL_OPTIONS ) ),
-m_aAutoCheckCheckBox( this, CUI_RES( CB_AUTOCHECK ) ),
-m_aEveryDayButton( this, CUI_RES( RB_EVERYDAY ) ),
-m_aEveryWeekButton( this, CUI_RES( RB_EVERYWEEK ) ),
-m_aEveryMonthButton( this, CUI_RES( RB_EVERYMONTH ) ),
-m_aCheckNowButton( this, CUI_RES( PB_CHECKNOW ) ),
-m_aAutoDownloadCheckBox( this, CUI_RES( CB_AUTODOWNLOAD ) ),
-m_aDestPathLabel( this, CUI_RES( FT_DESTPATHLABEL ) ),
-m_aDestPath( this, CUI_RES( FT_DESTPATH ) ),
-m_aChangePathButton( this, CUI_RES( PB_CHANGEPATH ) ),
-m_aLastChecked( this, CUI_RES( FT_LASTCHECKED ) )
+SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(Window* pParent, const
SfxItemSet& rSet)
+: SfxTabPage(pParent, "OptOnlineUpdatePage",
"cui/ui/optonlineupdatepage.ui", rSet)
{
-m_aNeverChecked = String( CUI_RES( STR_NEVERCHECKED ) );
-FreeResource();
-
-m_aAutoCheckCheckBox.SetClickHdl( LINK( this, SvxOnlineUpdateTabPage,
AutoCheckHdl_Impl ) );
-m_aCheckNowButton.SetClickHdl( LINK( this, SvxOnlineUpdateTabPage,
CheckNowHdl_Impl ) );
-m_aChangePathButton
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |9 - source/text/shared/01/online_update.xhp |6 +++--- source/text/shared/optionen/online_update.xhp | 13 +++-- 3 files changed, 10 insertions(+), 18 deletions(-) New commits: commit 20791d487f493ddd008553e9970a622362ca546c Author: Caolán McNamara Date: Wed Apr 3 10:05:44 2013 +0100 adapt help ids for online update page .ui conversion Change-Id: I1f5587e3c373f9c857e1f1fcf390e964da31034f diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index d9b1514..25cffcd 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -1454,7 +1454,6 @@ HID_DLG_ADABAS_TRANSACTIONLOG,37282, HID_DLG_ADABAS_TRANSACTIONLOG_SIZE,37287, HID_DLG_ADABAS_USR,37276, HID_DLG_ADD_IDX_STYLES,53243, -HID_DLG_CHECKFORONLINEUPDATE,33390, HID_DLG_COLWIDTH,38837, HID_DLG_CREATE_AUTH_ENTRY,53246, HID_DLG_CREATE_AUTOMARK,54917, @@ -3855,7 +3854,6 @@ HID_SVX_MDLG_ERR_REP_OPTIONS,40036, HID_SVX_MDLG_ERR_REP_PREVIEW,40037, HID_SVX_MODIFY_TOOLBAR,40051, HID_SVX_MODIFY_TOOLBAR_ITEM,40041, -HID_SVX_OPTIONS_ONLINEUPDATE,40054, HID_SVX_SAVE_IN,40042, HID_SVX_TABDLG_DOCRECOVERY,40029, HID_SVX_TP_DOCRECOVERY_RECOVER,40032, @@ -7512,8 +7510,6 @@ svx_CheckBox_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_VARIANT_FORM_KANJI,714474603, svx_CheckBox_RID_SVXPAGE_LINE_CBX_SYNCHRONIZE,701547521, svx_CheckBox_RID_SVXPAGE_LINE_CB_SYMBOL_RATIO,701547544, svx_CheckBox_RID_SVXPAGE_LINE_DEF_CBX_SYNCHRONIZE,701563905, -svx_CheckBox_RID_SVXPAGE_ONLINEUPDATE_CB_AUTOCHECK,705594379, -svx_CheckBox_RID_SVXPAGE_ONLINEUPDATE_CB_AUTODOWNLOAD,705594384, svx_CheckBox_RID_SVXPAGE_OPTIONS_CTL_CB_RESTRICTED,704840716, svx_CheckBox_RID_SVXPAGE_OPTIONS_CTL_CB_SEQUENCECHECKING,704840715, svx_CheckBox_RID_SVXPAGE_OPTIONS_CTL_CB_TYPE_REPLACE,704840717, @@ -8184,8 +8180,6 @@ svx_PushButton_RID_SVXPAGE_MACROASSIGN_PB_ASSIGN_COMPONENT,705565191, svx_PushButton_RID_SVXPAGE_MACROASSIGN_PB_DELETE,705565187, svx_PushButton_RID_SVXPAGE_MENUS_BTN_ADD_COMMANDS,705499974, svx_PushButton_RID_SVXPAGE_MENUS_BTN_NEW,705499960, -svx_PushButton_RID_SVXPAGE_ONLINEUPDATE_PB_CHANGEPATH,705597971, -svx_PushButton_RID_SVXPAGE_ONLINEUPDATE_PB_CHECKNOW,705597967, svx_PushButton_RID_SVXPAGE_OPTIONS_JAVA_PB_ADD,704860692, svx_PushButton_RID_SVXPAGE_OPTIONS_JAVA_PB_CLASSPATH,704860694, svx_PushButton_RID_SVXPAGE_OPTIONS_JAVA_PB_PARAMETER,704860693, @@ -8264,9 +8258,6 @@ svx_RadioButton_RID_SVXPAGE_INET_SEARCH_RB_EXACT,703332909, svx_RadioButton_RID_SVXPAGE_INET_SEARCH_RB_OR,703332908, svx_RadioButton_RID_SVXPAGE_KEYBOARD_RB_MODULE,705511981, svx_RadioButton_RID_SVXPAGE_KEYBOARD_RB_OFFICE,705511980, -svx_RadioButton_RID_SVXPAGE_ONLINEUPDATE_RB_EVERYDAY,705593868, -svx_RadioButton_RID_SVXPAGE_ONLINEUPDATE_RB_EVERYMONTH,705593870, -svx_RadioButton_RID_SVXPAGE_ONLINEUPDATE_RB_EVERYWEEK,705593869, svx_RadioButton_RID_SVXPAGE_OPTIONS_CTL_RB_MOVEMENT_LOGICAL,704840214, svx_RadioButton_RID_SVXPAGE_OPTIONS_CTL_RB_MOVEMENT_VISUAL,704840215, svx_RadioButton_RID_SVXPAGE_SWPOSSIZE_RB_ASCHAR,705430028, diff --git a/source/text/shared/01/online_update.xhp b/source/text/shared/01/online_update.xhp index f7b0fde..0260d21 100644 --- a/source/text/shared/01/online_update.xhp +++ b/source/text/shared/01/online_update.xhp @@ -32,9 +32,9 @@ Check for Updates UFI: changed name of page, see i76016Next time start download automatically - + Mark to enable the automatic check for updates. Choose %PRODUCTNAME - Online Update in the Options dialog box to disable or enable this feature. - + Click to select a folder to download the files. You can check for updates manually or automatically. @@ -75,4 +75,4 @@ If no update was found, you can close the dialog. You need Administrator rights to update %PRODUCTNAME. - \ No newline at end of file + diff --git a/source/text/shared/optionen/online_update.xhp b/source/text/shared/optionen/online_update.xhp index a4cb576..c6fa70a 100644 --- a/source/text/shared/optionen/online_update.xhp +++ b/source/text/shared/optionen/online_update.xhp @@ -36,27 +36,28 @@ Internet; checking for updates Online Update + Specifies some options for the automatic notification and downloading of online updates to %PRODUCTNAME. - + Check for updates automatically Mark to check for online updates periodically, then select the time interval how often %PRODUCTNAME will check for online updates. %PRODUCTNAME will check once a day, week, or month, as soon as a working Internet connection is detected. If you connect to the Internet by a proxy server, set the proxy on %PRODUCTNAME - PreferencesTools - Options - Internet - Proxy. When an update is available, an icon in the menu bar displays some explaining text. Click the icon to proceed. If you disable the check, the icon is removed from the menu bar. Online Update is a module that can be selected or deselected to be
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1e1ac3ba37de4aaab3e7fada378ecd73ee2f5b6c Author: Caolán McNamara Date: Wed Apr 3 10:05:44 2013 +0100 Updated core Project: help 20791d487f493ddd008553e9970a622362ca546c diff --git a/helpcontent2 b/helpcontent2 index f25d6a1..20791d4 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f25d6a1081dd929a8872fcd9305b5f06355d3337 +Subproject commit 20791d487f493ddd008553e9970a622362ca546c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: redland/ExternalProject_redland.mk
redland/ExternalProject_redland.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 5020e25c88a3a0ed11222f8b255b35abb5dc4d5a Author: Michael Stahl Date: Wed Apr 3 15:27:42 2013 +0200 redland: stop using --with-threads, it supports only POSIX... ... so it's better to wrap an osl::Mutex around the whole thing in client code. Change-Id: I611aa879e03c11c01fbd215148750a11a285b216 diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk index 530295a..c35a5bf 100644 --- a/redland/ExternalProject_redland.mk +++ b/redland/ExternalProject_redland.mk @@ -36,6 +36,7 @@ $(call gb_ExternalProject_get_state_target,redland,build): RASQAL_LIBS="-L$(OUTDIR)/lib -lrasqal" \ ./configure --disable-static --disable-gtk-doc \ --disable-modular \ + --without-threads \ --without-bdb --without-sqlite --without-mysql \ --without-postgresql --without-threestore --without-virtuoso \ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ @@ -59,12 +60,12 @@ $(call gb_ExternalProject_get_state_target,redland,build): RASQAL_LIBS="-L$(OUTDIR)/lib -lrasqal" \ ./configure --disable-gtk-doc \ --disable-modular \ + --without-threads \ --without-bdb --without-sqlite --without-mysql \ --without-postgresql --without-threestone --without-virtuoso \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__OOO) \ $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ - $(if $(filter-out ANDROID,$(OS)),--with-threads) \ && $(MAKE) \ $(if $(filter MACOSX,$(OS)),&& $(PERL) \ $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-4-0] fdo#32082: Do not reset number format in table cells on edit...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3187
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/3187/1
fdo#32082: Do not reset number format in table cells on edit.
When we changed the default to _not_ to recognize the number formats in table
cells (commit 334c34e4ec803c65e43abf20edbc6faf7fa95e76), it caused that any
edit of a number formatted cell had reset it to text on edit.
This was quite unexpected, because when eg. there was a number that contributed
to a sum, and it changed to text, the sum changed as if there was a '0' there.
To solve this, try hard to retain the number format regardless of the
'Recognize Number Formats' setting when there was a number formatting assigned
to the cell.
Change-Id: Ib43e0877420d90cdac7a0357d1ef3a549c866fb7
---
M sw/source/core/docnode/ndtbl.cxx
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 08b710a..df85ebc 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -4022,31 +4022,35 @@
SwTableBoxFmt* pBoxFmt = (SwTableBoxFmt*)rBox.GetFrmFmt();
SfxItemSet aBoxSet( GetAttrPool(), RES_BOXATR_FORMAT,
RES_BOXATR_VALUE );
-sal_Bool bSetNumFmt = IsInsTblFormatNum();
sal_Bool bLockModify = sal_True;
+sal_Bool bSetNumFmt = sal_False;
+const bool bForceNumberFormat = IsInsTblFormatNum() &&
IsInsTblChangeNumFormat();
-if( bSetNumFmt && !IsInsTblChangeNumFormat() )
+// if the user forced a number format in this cell previously,
+// keep it, unless the user set that she wants the full number
+// format recognition
+if( pNumFmtItem && !bForceNumberFormat )
{
-if( !pNumFmtItem )
-bSetNumFmt = sal_False;
+sal_uLong nOldNumFmt =
((SwTblBoxNumFormat*)pNumFmtItem)->GetValue();
+SvNumberFormatter* pNumFmtr = GetNumberFormatter();
+
+short nFmtType = pNumFmtr->GetType( nFmtIdx );
+if( nFmtType == pNumFmtr->GetType( nOldNumFmt ) ||
NUMBERFORMAT_NUMBER == nFmtType )
+{
+// Current and specified NumFormat match
+// -> keep old Format
+nFmtIdx = nOldNumFmt;
+bSetNumFmt = sal_True;
+}
else
{
-sal_uLong nOldNumFmt =
((SwTblBoxNumFormat*)pNumFmtItem)->GetValue();
-SvNumberFormatter* pNumFmtr = GetNumberFormatter();
-
-short nFmtType = pNumFmtr->GetType( nFmtIdx );
-if( nFmtType == pNumFmtr->GetType( nOldNumFmt ) ||
NUMBERFORMAT_NUMBER == nFmtType )
-// Current and specified NumFormat match
-// -> keep old Format
-nFmtIdx = nOldNumFmt;
-else
-// Current and specified NumFormat do not match
-// -> insert as Text
-bLockModify = bSetNumFmt = sal_False;
+// Current and specified NumFormat do not match
+// -> insert as Text
+bLockModify = bSetNumFmt = sal_False;
}
}
-if( bSetNumFmt )
+if( bSetNumFmt || bForceNumberFormat )
{
pBoxFmt = (SwTableBoxFmt*)rBox.ClaimFrmFmt();
--
To view, visit https://gerrit.libreoffice.org/3187
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib43e0877420d90cdac7a0357d1ef3a549c866fb7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Jan Holesovsky
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Keep semantics, but improve readibility.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3186
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/3186/1
Keep semantics, but improve readibility.
Change-Id: I32c18cb7b080f4847118a2d7e8d77dcd2bbce308
---
M sw/source/core/docnode/ndtbl.cxx
1 file changed, 27 insertions(+), 30 deletions(-)
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 252ac7f..08b710a 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -4022,39 +4022,36 @@
SwTableBoxFmt* pBoxFmt = (SwTableBoxFmt*)rBox.GetFrmFmt();
SfxItemSet aBoxSet( GetAttrPool(), RES_BOXATR_FORMAT,
RES_BOXATR_VALUE );
-sal_Bool bSetNumFmt = IsInsTblFormatNum(), bLockModify = sal_True;
+sal_Bool bSetNumFmt = IsInsTblFormatNum();
+sal_Bool bLockModify = sal_True;
+
+if( bSetNumFmt && !IsInsTblChangeNumFormat() )
+{
+if( !pNumFmtItem )
+bSetNumFmt = sal_False;
+else
+{
+sal_uLong nOldNumFmt =
((SwTblBoxNumFormat*)pNumFmtItem)->GetValue();
+SvNumberFormatter* pNumFmtr = GetNumberFormatter();
+
+short nFmtType = pNumFmtr->GetType( nFmtIdx );
+if( nFmtType == pNumFmtr->GetType( nOldNumFmt ) ||
NUMBERFORMAT_NUMBER == nFmtType )
+// Current and specified NumFormat match
+// -> keep old Format
+nFmtIdx = nOldNumFmt;
+else
+// Current and specified NumFormat do not match
+// -> insert as Text
+bLockModify = bSetNumFmt = sal_False;
+}
+}
+
if( bSetNumFmt )
{
-if( !IsInsTblChangeNumFormat() )
-{
-if( !pNumFmtItem )
-bSetNumFmt = sal_False;
-else
-{
-sal_uLong nOldNumFmt =
((SwTblBoxNumFormat*)pNumFmtItem)->
-GetValue();
-SvNumberFormatter* pNumFmtr = GetNumberFormatter();
+pBoxFmt = (SwTableBoxFmt*)rBox.ClaimFrmFmt();
-short nFmtType = pNumFmtr->GetType( nFmtIdx );
-if( nFmtType == pNumFmtr->GetType( nOldNumFmt ) ||
-NUMBERFORMAT_NUMBER == nFmtType )
-// Current and specified NumFormat match
-// -> keep old Format
-nFmtIdx = nOldNumFmt;
-else
-// Current and specified NumFormat do not match
-// -> insert as Text
-bLockModify = bSetNumFmt = sal_False;
-}
-}
-
-if( bSetNumFmt )
-{
-pBoxFmt = (SwTableBoxFmt*)rBox.ClaimFrmFmt();
-
-aBoxSet.Put( SwTblBoxValue( fNumber ));
-aBoxSet.Put( SwTblBoxNumFormat( nFmtIdx ));
-}
+aBoxSet.Put( SwTblBoxValue( fNumber ));
+aBoxSet.Put( SwTblBoxNumFormat( nFmtIdx ));
}
// It's not enough to only reset the Formula.
--
To view, visit https://gerrit.libreoffice.org/3186
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I32c18cb7b080f4847118a2d7e8d77dcd2bbce308
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Jan Holesovsky
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/core/docnode/ndtbl.cxx | 57 +++
1 file changed, 29 insertions(+), 28 deletions(-)
New commits:
commit f8be3d02573c4d6d753b5e0c1a449e932f94bd81
Author: Jan Holesovsky
Date: Wed Apr 3 11:49:38 2013 +0200
fdo#32082: Do not reset number format in table cells on edit.
When we changed the default to _not_ to recognize the number formats in
table
cells (commit 334c34e4ec803c65e43abf20edbc6faf7fa95e76), it caused that any
edit of a number formatted cell had reset it to text on edit.
This was quite unexpected, because when eg. there was a number that
contributed
to a sum, and it changed to text, the sum changed as if there was a '0'
there.
To solve this, try hard to retain the number format regardless of the
'Recognize Number Formats' setting when there was a number formatting
assigned
to the cell.
Change-Id: Ib43e0877420d90cdac7a0357d1ef3a549c866fb7
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 4fd72a8..398dd6a 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -4028,31 +4028,35 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool
bCallUpdate )
SwTableBoxFmt* pBoxFmt = (SwTableBoxFmt*)rBox.GetFrmFmt();
SfxItemSet aBoxSet( GetAttrPool(), RES_BOXATR_FORMAT,
RES_BOXATR_VALUE );
-sal_Bool bSetNumFmt = IsInsTblFormatNum();
sal_Bool bLockModify = sal_True;
+sal_Bool bSetNumFmt = sal_False;
+const bool bForceNumberFormat = IsInsTblFormatNum() &&
IsInsTblChangeNumFormat();
-if( bSetNumFmt && !IsInsTblChangeNumFormat() )
+// if the user forced a number format in this cell previously,
+// keep it, unless the user set that she wants the full number
+// format recognition
+if( pNumFmtItem && !bForceNumberFormat )
{
-if( !pNumFmtItem )
-bSetNumFmt = sal_False;
+sal_uLong nOldNumFmt =
((SwTblBoxNumFormat*)pNumFmtItem)->GetValue();
+SvNumberFormatter* pNumFmtr = GetNumberFormatter();
+
+short nFmtType = pNumFmtr->GetType( nFmtIdx );
+if( nFmtType == pNumFmtr->GetType( nOldNumFmt ) ||
NUMBERFORMAT_NUMBER == nFmtType )
+{
+// Current and specified NumFormat match
+// -> keep old Format
+nFmtIdx = nOldNumFmt;
+bSetNumFmt = sal_True;
+}
else
{
-sal_uLong nOldNumFmt =
((SwTblBoxNumFormat*)pNumFmtItem)->GetValue();
-SvNumberFormatter* pNumFmtr = GetNumberFormatter();
-
-short nFmtType = pNumFmtr->GetType( nFmtIdx );
-if( nFmtType == pNumFmtr->GetType( nOldNumFmt ) ||
NUMBERFORMAT_NUMBER == nFmtType )
-// Current and specified NumFormat match
-// -> keep old Format
-nFmtIdx = nOldNumFmt;
-else
-// Current and specified NumFormat do not match
-// -> insert as Text
-bLockModify = bSetNumFmt = sal_False;
+// Current and specified NumFormat do not match
+// -> insert as Text
+bLockModify = bSetNumFmt = sal_False;
}
}
-if( bSetNumFmt )
+if( bSetNumFmt || bForceNumberFormat )
{
pBoxFmt = (SwTableBoxFmt*)rBox.ClaimFrmFmt();
commit c44a06a122d916a18bbede0126bb1e4614f244dc
Author: Jan Holesovsky
Date: Wed Apr 3 11:44:28 2013 +0200
Keep semantics, but improve readibility.
Change-Id: I32c18cb7b080f4847118a2d7e8d77dcd2bbce308
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 882ff1b..4fd72a8 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -4028,39 +4028,36 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool
bCallUpdate )
SwTableBoxFmt* pBoxFmt = (SwTableBoxFmt*)rBox.GetFrmFmt();
SfxItemSet aBoxSet( GetAttrPool(), RES_BOXATR_FORMAT,
RES_BOXATR_VALUE );
-sal_Bool bSetNumFmt = IsInsTblFormatNum(), bLockModify = sal_True;
-if( bSetNumFmt )
+sal_Bool bSetNumFmt = IsInsTblFormatNum();
+sal_Bool bLockModify = sal_True;
+
+if( bSetNumFmt && !IsInsTblChangeNumFormat() )
{
-if( !IsInsTblChangeNumFormat() )
+if( !pNumFmtItem )
+bSetNumFmt = sal_False;
+else
{
-if( !pNumFmtItem )
-bSetNumFmt = sal_False;
+sal_uLong nOldNumFmt =
((SwTbl
[PUSHED] Make autogen.sh prefer to read an autogen.input file
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3111 Approvals: Michael Meeks: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3111 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7e3c747fa95e9f2f0bc44036419aaab8f4ad01e7 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Tor Lillqvist Gerrit-Reviewer: Michael Meeks ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] ooxmlimport: conditional table styles fixed
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3175 Approvals: Thorsten Behrens: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3175 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I84f1d7c718dfc120b76364479ca68f63d2549b9f Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Sven Jacobi Gerrit-Reviewer: Sven Jacobi Gerrit-Reviewer: Thorsten Behrens ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: autogen.sh Makefile.in
Makefile.in |9 +
autogen.sh | 40 ++--
2 files changed, 27 insertions(+), 22 deletions(-)
New commits:
commit ca0c54d0fe3812cec64e5c7cc83309d4397f5e0a
Author: Tor Lillqvist
Date: Thu Mar 28 15:26:25 2013 +0200
Make autogen.sh prefer to read an autogen.input file
For backward compatibility, an autogen.lastrun file will still be used if it
exists and autogen.input does not exist. The recommended workflow is now to
keep the configuration parametets in autogen.input which is never written by
autogen.sh.
Most (?) developers used to treat autogen.lastrun as a valuable parameter
file
to be edited manually anyway, and not as an ad-hoc backup copy of
command-line
parameters last used. The name autogen.input better reflects this usage.
Change-Id: I7e3c747fa95e9f2f0bc44036419aaab8f4ad01e7
Reviewed-on: https://gerrit.libreoffice.org/3111
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/Makefile.in b/Makefile.in
index f19de69..ecfbc1c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,16 +33,17 @@ $(BUILDDIR)/config_host.mk : \
$(SRCDIR)/Makefile.in \
$(SRCDIR)/instsetoo_native/util/openoffice.lst.in \
$(SRCDIR)/configure.ac \
- $(BUILDDIR)/autogen.lastrun
+ $(if $(wildcard
$(BUILDDIR)/autogen.input),$(BUILDDIR)/autogen.input,$(if $(wildcard
$(BUILDDIR)/autogen.lastrun),$(BUILDDIR)/autogen.lastrun))
$(SRCDIR)/autogen.sh
-# dummy rule in case any of the above prerequisites are removed, so that a
stale
-# Makefile still triggers autogen.sh, or in case autogen.lastrun does not yet
-# exist
+# dummy rule in case any of the above prerequisites are removed, so
+# that a stale Makefile still triggers autogen.sh, or in case
+# autogen.input does not exist, or autogen.lastrun does not yet exist
$(SRCDIR)/config_host.mk.in \
$(SRCDIR)/Makefile.in \
$(SRCDIR)/instsetoo_native/util/openoffice.lst.in \
$(SRCDIR)/configure.ac \
+$(BUILDDIR)/autogen.input \
$(BUILDDIR)/autogen.lastrun:
@true
diff --git a/autogen.sh b/autogen.sh
index fa77b73..f5960e3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,7 +21,7 @@ sub clean()
{
system ("rm -Rf autom4te.cache");
system ("rm -f missing install-sh mkinstalldirs libtool ltmain.sh");
-print "cleaned the build tree\n";
+print "Cleaned the build tree\n";
}
my $aclocal;
@@ -108,9 +108,18 @@ for my $arg (@ARGV) {
}
my @cmdline_args = ();
-if (!@ARGV) {
-my $lastrun = "autogen.lastrun";
-@cmdline_args = read_args ($lastrun) if (-f $lastrun);
+
+my $input = "autogen.input";
+my $lastrun = "autogen.lastrun";
+
+if (-f $input) {
+warn "Ignoring command-line arguments, using $input.\n" if (@ARGV);
+warn "Ignoring $lastrun, using $input.\n" if (-f $lastrun);
+@cmdline_args = read_args ($input);
+} elsif (-f $lastrun) {
+warn "Ignoring command-line arguments, using $lastrun.\n" if (@ARGV);
+print STDERR "Reading $lastrun. Please rename it to $input to avoid this
message.\n";
+@cmdline_args = read_args ($lastrun);
} else {
@cmdline_args = @ARGV;
}
@@ -118,7 +127,7 @@ if (!@ARGV) {
my @args;
my $default_config = "$src_path/distro-configs/default.conf";
if (-f $default_config) {
-print STDERR "Reading default config file: $default_config\n";
+print STDERR "Reading default config file: $default_config.\n";
push @args, read_args ($default_config);
}
for my $arg (@cmdline_args) {
@@ -164,40 +173,35 @@ if ($src_path ne $build_path)
system ("$aclocal $aclocal_flags") && die "Failed to run aclocal";
unlink ("configure");
system ("autoconf -I ${src_path}") && die "Failed to run autoconf";
-die "failed to generate configure" if (! -f "configure");
+die "Failed to generate the configure script" if (! -f "configure");
if (defined $ENV{NOCONFIGURE}) {
print "Skipping configure process.";
} else {
# Save autogen.lastrun only if we did get some arguments on the
command-line
-if (@ARGV) {
+if (! -f $input && @ARGV) {
if (scalar(@cmdline_args) > 0) {
# if there's already an autogen.lastrun, make a backup first
-if (-e "autogen.lastrun") {
-open (my $fh, "autogen.lastrun") || warn "can't open
autogen.lastrun. \n";
-open (BAK, ">autogen.lastrun.bak") || warn "can't create
backup file. \n";
+if (-e $lastrun) {
+open (my $fh, $lastrun) || warn "Can't open $lastrun.\n";
+open (BAK, ">$lastrun.bak") || warn "Can't create backup file
$lastrun.bak.\n";
while (<$fh>) {
print BAK;
}
close (BAK) && close ($fh);
}
-# print "writing args to autogen.lastrun\n";
+# print "Saving command-line args to $lastrun\n";
my $fh;
-open ($fh, ">autogen.last
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/conditionalstyles-tbllook.docx |binary
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 102 ---
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 21 --
writerfilter/source/dmapper/PropertyIds.cxx |4
writerfilter/source/dmapper/PropertyIds.hxx |2
writerfilter/source/dmapper/StyleSheetTable.cxx | 49 ++---
6 files changed, 110 insertions(+), 68 deletions(-)
New commits:
commit 35b75ed510f49ff64cd86b38e228c2b5b9a9f3fc
Author: SJacobi
Date: Tue Apr 2 18:33:34 2013 +0200
ooxmlimport: conditional table styles fixed
Change-Id: I84f1d7c718dfc120b76364479ca68f63d2549b9f
Reviewed-on: https://gerrit.libreoffice.org/3175
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/sw/qa/extras/ooxmlimport/data/conditionalstyles-tbllook.docx
b/sw/qa/extras/ooxmlimport/data/conditionalstyles-tbllook.docx
new file mode 100644
index 000..4222d63
Binary files /dev/null and
b/sw/qa/extras/ooxmlimport/data/conditionalstyles-tbllook.docx differ
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 176f3c9..6a0609b 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -263,6 +263,7 @@ struct WRITERFILTER_DLLPRIVATE TableInfo
sal_Int32 nRightBorderDistance;
sal_Int32 nTopBorderDistance;
sal_Int32 nBottomBorderDistance;
+sal_Int32 nTblLook;
sal_Int32 nNestLevel;
PropertyMapPtr pTableDefaults;
PropertyMapPtr pTableBorders;
@@ -274,6 +275,7 @@ struct WRITERFILTER_DLLPRIVATE TableInfo
, nRightBorderDistance(DEF_BORDER_DIST)
, nTopBorderDistance(0)
, nBottomBorderDistance(0)
+, nTblLook(0x4a0)
, nNestLevel(0)
, pTableDefaults(new PropertyMap)
, pTableBorders(new PropertyMap)
@@ -360,6 +362,14 @@ TableStyleSheetEntry *
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
}
}
+PropertyMap::iterator aTblLookIter =
+aTblLookIter = m_aTableProperties->find( PropertyDefinition(
PROP_TBL_LOOK, false ) );
+if(aTblLookIter != m_aTableProperties->end())
+{
+aTblLookIter->second >>= rInfo.nTblLook;
+m_aTableProperties->erase( aTblLookIter );
+}
+
// Set the table default attributes for the cells
rInfo.pTableDefaults->InsertProps(m_aTableProperties);
@@ -494,6 +504,19 @@ TableStyleSheetEntry *
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
return pTableStyle;
}
+#define CNF_FIRST_ROW 0x800
+#define CNF_LAST_ROW0x400
+#define CNF_FIRST_COLUMN0x200
+#define CNF_LAST_COLUMN 0x100
+#define CNF_ODD_VBAND 0x080
+#define CNF_EVEN_VBAND 0x040
+#define CNF_ODD_HBAND 0x020
+#define CNF_EVEN_HBAND 0x010
+#define CNF_FIRST_ROW_LAST_COLUMN 0x008
+#define CNF_FIRST_ROW_FIRST_COLUMN 0x004
+#define CNF_LAST_ROW_LAST_COLUMN0x002
+#define CNF_LAST_ROW_FIRST_COLUMN 0x001
+
CellPropertyValuesSeq_t
DomainMapperTableHandler::endTableGetCellProperties(TableInfo & rInfo)
{
#ifdef DEBUG_DMAPPER_TABLE_HANDLER
@@ -523,21 +546,30 @@ CellPropertyValuesSeq_t
DomainMapperTableHandler::endTableGetCellProperties(Tabl
PropertyMapVector1::const_iterator aCellIterator =
aRowOfCellsIterator->begin();
PropertyMapVector1::const_iterator aCellIteratorEnd =
aRowOfCellsIterator->end();
-// Get the row style properties
-sal_Int32 nRowStyleMask = sal_Int32( 0 );
-PropertyMapPtr pRowProps = m_aRowProperties[nRow];
-if ( pRowProps.get( ) )
+sal_Int32 nRowStyleMask = 0;
+
+if (aRowOfCellsIterator==m_aCellProperties.begin())
{
-PropertyMap::iterator pTcCnfStyleIt = pRowProps->find(
PropertyDefinition( PROP_CNF_STYLE, true ) );
-if ( pTcCnfStyleIt != pRowProps->end( ) )
-{
-if ( rInfo.pTableStyle )
-{
-OUString sMask;
-pTcCnfStyleIt->second >>= sMask;
-nRowStyleMask = sMask.toInt32( 2 );
-}
-pRowProps->erase( pTcCnfStyleIt );
+if(rInfo.nTblLook&0x20)
+nRowStyleMask |= CNF_FIRST_ROW; // first row style used
+}
+else if (aRowOfCellsIterator==aLastRowIterator)
+{
+if(rInfo.nTblLook&0x40)
+nRowStyleMask |= CNF_LAST_ROW; // last row style used
+}
+if(!nRowStyleMask) // if no row style used yet
+{
+// banding used only if not first and or last row style used
+if(!(rInfo.nTblLook&0x200))
+{ // hbanding used
+int n = n
Re: Changement de license pour ooeclipse
Ok pour moi All of my past & future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license Ludovic "Le bonheur est la seule chose qui se double si on le partage." Albert Schweitzer "Le hasard, c'est Dieu qui se promène incognito." (Albert Einstein / 1879-1955)Ok pour moi All of my past & future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license On 03/04/2013 13:15, Cedric Bosdonnat wrote: All of my past & future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-3.6-17'
Tag 'suse-3.6-17' created by Andras Timar at 2013-04-03 14:03 -0700 suse-3.6-17 Changes since suse-3.6-0-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-3.6-17'
Tag 'suse-3.6-17' created by Andras Timar at 2013-04-03 14:03 -0700 suse-3.6-17 Changes since suse-3.6-12: Fridrich Å trba (2): Branch libreoffice-3-6-5 Version 3.6.5.2, tag libreoffice-3.6.5.2 Petr Mladek (1): Merge tag 'libreoffice-3.6.5.2' into suse-3.6 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-3.6-17'
Tag 'suse-3.6-17' created by Andras Timar at 2013-04-03 14:03 -0700 suse-3.6-17 Changes since suse-3.6-12: Andras Timar (3): updated pt-PT spelling dictionary fdo#56130 update Galician dictionary pack Update pt-PT dictionary Fridrich Å trba (2): Branch libreoffice-3-6-5 Version 3.6.5.2, tag libreoffice-3.6.5.2 Lior Kaplan (1): Update Hebrew dictionary to one created with Hspell 1.2 (taken from Fedora 17 64bit) Olivier Hallot (1): Fix for fdo#53520, Portuguese spelling files Petr Mladek (1): Merge tag 'libreoffice-3.6.5.2' into suse-3.6 --- dictionaries/pt_PT/description.xml |2 dictionaries/pt_PT/pt_PT.dic | 257 - 2 files changed, 144 insertions(+), 115 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-17'
Tag 'suse-3.6-17' created by Andras Timar at 2013-04-03 14:03 -0700 suse-3.6-17 Changes since suse-3.6-12: Fridrich Å trba (2): Branch libreoffice-3-6-5 Version 3.6.5.2, tag libreoffice-3.6.5.2 Petr Mladek (1): Merge tag 'libreoffice-3.6.5.2' into suse-3.6 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-3.6-17'
Tag 'suse-3.6-17' created by Andras Timar at 2013-04-03 14:03 -0700 suse-3.6-17 Changes since suse-3.6-16-8: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: unit test failure in forms module, something do with com.sun.star.form.control.FixedText
On 2013-04-03 14:33, Thomas Arnhold wrote: Hi Noel, maybe this grepping for "control\.FixedText" helps you: stardiv.vcl.control.FixedText com.sun.star.form.control.FixedText So there is toolkit/source/helper/servicenames.cxx which uses szServiceName_UnoControlFixedText[] = "stardiv.vcl.control.FixedText" If the "com.sun.star.form.control.FixedText" service followed the same pattern as the other "com.sun.star.form.control.*" services, I would expect to find a class called "OFixedTextControl" inside the file forms/source/component/FixedText.cxx But that file does not contain such a class, unlike all of it's friends in the same folder. Very strange. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 5 commits - libxml2/libxml2-configure.patch libxslt/ExternalProject_xslt.mk libxslt/libxslt-configure.patch redland/ExternalPackage_raptor.mk redland/ExternalPackage_ra
libxml2/libxml2-configure.patch|2 +- libxslt/ExternalProject_xslt.mk|2 +- libxslt/libxslt-configure.patch|2 +- redland/ExternalPackage_raptor.mk |3 --- redland/ExternalPackage_rasqal.mk |2 -- redland/ExternalProject_raptor.mk |9 - redland/ExternalProject_rasqal.mk |9 - redland/ExternalProject_redland.mk | 10 -- redland/Module_redland.mk |2 +- 9 files changed, 16 insertions(+), 25 deletions(-) New commits: commit 66c028fa4c5c3a7c9756c61130d0506e01b58d23 Author: Michael Stahl Date: Wed Apr 3 14:41:25 2013 +0200 redland: clean up libxml2 usage - use xml2-config from unpacked dir - rasqal does use libxml2 apparently for utils - redland itself does not use libxml2 directly - no need to put OUTDIR/bin on PATH Change-Id: Ib4481c681d0b188c06217f7bc0d000f15ab82da3 diff --git a/redland/ExternalProject_raptor.mk b/redland/ExternalProject_raptor.mk index f5fc5df..b35578d 100644 --- a/redland/ExternalProject_raptor.mk +++ b/redland/ExternalProject_raptor.mk @@ -29,6 +29,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build): --without-xslt-config \ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --target=$(HOST_PLATFORM) \ lt_cv_cc_dll_switch="-shared" \ + $(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \ && $(MAKE) \ ) else @@ -48,7 +49,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build): $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__OOO) \ $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ - $(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(OUTDIR)/bin/xml2-config) \ + $(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \ && $(MAKE) \ ) endif diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk index b82e4c1..10ff5f3 100644 --- a/redland/ExternalProject_rasqal.mk +++ b/redland/ExternalProject_rasqal.mk @@ -37,13 +37,13 @@ $(call gb_ExternalProject_get_state_target,rasqal,build): --with-digest-library=internal \ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ lt_cv_cc_dll_switch="-shared" \ + $(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \ && $(MAKE) \ ) else $(call gb_ExternalProject_get_state_target,rasqal,build): $(call gb_ExternalProject_run,build,\ CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \ - PATH="$(OUTDIR)/bin:$$PATH" \ LDFLAGS=" \ $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-rpath-link$(COMMA)$(OUTDIR)/lib -Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \ $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl)) \ @@ -60,6 +60,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build): $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__OOO) \ $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ + $(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \ && $(MAKE) \ $(if $(filter MACOSX,$(OS)),&& $(PERL) \ $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \ diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk index e75d11f..530295a 100644 --- a/redland/ExternalProject_redland.mk +++ b/redland/ExternalProject_redland.mk @@ -11,8 +11,6 @@ $(eval $(call gb_ExternalProject_ExternalProject,redland)) $(eval $(call gb_ExternalProject_use_unpacked,redland,redland)) -$(eval $(call gb_ExternalProject_use_external,redland,libxml2)) - $(eval $(call gb_ExternalProject_use_packages,redland, \ raptor \ rasqal \ commit 6848b33c9fdcc67e842627e1da588031a63b88ee Author: Michael Stahl Date: Wed Apr 3 14:26:25 2013 +0200 redland: we don't need the raptor features using libxslt Change-Id: I6288e7550a10be072ad1665bd03a8e6499bc4033 diff --git a/redland/ExternalProject_raptor.mk b/redl
Re: unit test failure in forms module, something do with com.sun.star.form.control.FixedText
Hi Noel,
maybe this grepping for "control\.FixedText" helps you:
stardiv.vcl.control.FixedText
com.sun.star.form.control.FixedText
So there is toolkit/source/helper/servicenames.cxx which uses
szServiceName_UnoControlFixedText[] = "stardiv.vcl.control.FixedText"
Maybe that wasn't converted in the past?!
Thomas
On 03.04.2013 14:19, Noel Grandin wrote:
Hi
I'm fighting a "make check" failure on a clean master build, running
under 64-bit Ubuntu.
The failure is inside:
make JunitTest_forms_unoapi
The error message looks like:
xwarn:legacy.osl:28578:327:svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx:1245:
caught an exception!
in function:static bool
sdr::contact::ViewObjectContactOfUnoControl_Impl::createControlForDevice
type: com.sun.star.uno.RuntimeException
message: unsatisfied query for interface of type
com.sun.star.awt.XControl
The object that is being queried is an SdrUnoObject, which has an
aUnoControlTypeName member which reads
"com.sun.star.form.control.FixedText"
The
ViewObjectContactOfUnoControl_Impl::createControlForDevice
method is called from
ViewObjectContactOfUnoControl_Impl::impl_ensureControl_noThrow
which gets the pUnoObject field by calling
getUnoObject
which calls
ViewContactOfSdrObj::TryToGetSdrObject
which calls
GetSdrObject
which returns the
mrObject
field.
From there, following the constructor call stack back gets me to
SdrUnoObj::setUnoControlModel
which is called from the Java unit test code.
Using GDB, I find that something in the unit test code is passing an
awt::XControlModel UNO object to SvxShapeControl::setControl()
That XControlModel is returning "com.sun.star.form.control.FixedText"
when called like this:
beans::XPropertySet::getPropertyValue("DefaultControl")
Grepping through the source code, "com.sun.star.form.control.FixedText"
is only found in
forms/source/inc/services.hxxx
but the global constants declared there are not used anywhere else
(confirmed by removing them and rebuilding).
Nothing seems to actually implement this service.
Any ideas?
Regards, Noel Grandin
Disclaimer: http://www.peralex.com/disclaimer.html
___
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
unit test failure in forms module, something do with com.sun.star.form.control.FixedText
Hi
I'm fighting a "make check" failure on a clean master build, running
under 64-bit Ubuntu.
The failure is inside:
make JunitTest_forms_unoapi
The error message looks like:
xwarn:legacy.osl:28578:327:svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx:1245:
caught an exception!
in function:static bool
sdr::contact::ViewObjectContactOfUnoControl_Impl::createControlForDevice
type: com.sun.star.uno.RuntimeException
message: unsatisfied query for interface of type
com.sun.star.awt.XControl
The object that is being queried is an SdrUnoObject, which has an
aUnoControlTypeName member which reads "com.sun.star.form.control.FixedText"
The
ViewObjectContactOfUnoControl_Impl::createControlForDevice
method is called from
ViewObjectContactOfUnoControl_Impl::impl_ensureControl_noThrow
which gets the pUnoObject field by calling
getUnoObject
which calls
ViewContactOfSdrObj::TryToGetSdrObject
which calls
GetSdrObject
which returns the
mrObject
field.
From there, following the constructor call stack back gets me to
SdrUnoObj::setUnoControlModel
which is called from the Java unit test code.
Using GDB, I find that something in the unit test code is passing an
awt::XControlModel UNO object to SvxShapeControl::setControl()
That XControlModel is returning "com.sun.star.form.control.FixedText"
when called like this:
beans::XPropertySet::getPropertyValue("DefaultControl")
Grepping through the source code, "com.sun.star.form.control.FixedText"
is only found in
forms/source/inc/services.hxxx
but the global constants declared there are not used anywhere else
(confirmed by removing them and rebuilding).
Nothing seems to actually implement this service.
Any ideas?
Regards, Noel Grandin
Disclaimer: http://www.peralex.com/disclaimer.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: redland/rasqal redland/redland redland/UnpackedTarball_rasqal.mk redland/UnpackedTarball_redland.mk
redland/UnpackedTarball_rasqal.mk|1 + redland/UnpackedTarball_redland.mk |1 + redland/rasqal/rasqal-xcompile.patch.1 | 15 +++ redland/redland/redland-xcompile.patch.1 | 15 +++ 4 files changed, 32 insertions(+) New commits: commit 98450e64e19ae3ffe0c1973799f402bb5491 Author: Tor Lillqvist Date: Wed Apr 3 15:13:55 2013 +0300 Fix Android build of redland and rasqal Instead of bothering to pass in -lxml and -lm so that the test and/or util executables get built, just patch out building them when cross-compiling. Change-Id: Ida38dcdc56675eca6ff9d549ce62b15da8e82f13 diff --git a/redland/UnpackedTarball_rasqal.mk b/redland/UnpackedTarball_rasqal.mk index 4da1944..ef28ea7 100644 --- a/redland/UnpackedTarball_rasqal.mk +++ b/redland/UnpackedTarball_rasqal.mk @@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,rasqal,\ $(if $(filter-out WNT,$(OS)),redland/rasqal/rasqal-bundled-soname.patch.1) \ $(if $(filter ANDROID,$(OS)),redland/rasqal/rasqal-android.patch.1) \ $(if $(filter WNTGCC,$(OS)$(COM)),redland/rasqal/rasqal-mingw.patch.1) \ + $(if $(filter YES,$(CROSS_COMPILING)),redland/rasqal/rasqal-xcompile.patch.1) \ )) # vim: set noet sw=4 ts=4: diff --git a/redland/UnpackedTarball_redland.mk b/redland/UnpackedTarball_redland.mk index 2b38a48..dd2a15c 100644 --- a/redland/UnpackedTarball_redland.mk +++ b/redland/UnpackedTarball_redland.mk @@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,redland,\ $(if $(filter-out WNT,$(OS)),redland/redland/redland-bundled-soname.patch.1) \ $(if $(filter ANDROID,$(OS)),redland/redland/redland-android.patch.1) \ $(if $(filter WNTGCC,$(OS)$(COM)),redland/redland/redland-mingw.patch.1) \ + $(if $(filter YES,$(CROSS_COMPILING)),redland/redland/redland-xcompile.patch.1) \ )) # vim: set noet sw=4 ts=4: diff --git a/redland/rasqal/rasqal-xcompile.patch.1 b/redland/rasqal/rasqal-xcompile.patch.1 new file mode 100644 index 000..546975c --- /dev/null +++ b/redland/rasqal/rasqal-xcompile.patch.1 @@ -0,0 +1,15 @@ +No point in creating util or test executables when cross-compiling. +(Especially as doing it anyway wouldn't work without tweaks to have it find +libxml2 and libm, at least for Android.) + +--- a/Makefile.in b/Makefile.in +@@ -358,7 +358,7 @@ + top_srcdir = @top_srcdir@ + noinst_SCRIPTS = rasqal-src-config + ACLOCAL_AMFLAGS = -I build +-SUBDIRS = src utils tests docs data win32 scripts ++SUBDIRS = src docs data win32 scripts + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = rasqal.pc + EXTRA_DIST = \ diff --git a/redland/redland/redland-xcompile.patch.1 b/redland/redland/redland-xcompile.patch.1 new file mode 100644 index 000..2635359 --- /dev/null +++ b/redland/redland/redland-xcompile.patch.1 @@ -0,0 +1,15 @@ +No point in creating example or util executables when cross-compiling. +(Especially as doing it anyway wouldn't work without tweaks to have it find +libxml2 and libm, at least for Android.) + +--- a/Makefile.in b/Makefile.in +@@ -395,7 +395,7 @@ + DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc + + # Subdirectories to build/install/distribute etc. +-SUBDIRS = $(subdirs) src examples utils demos docs data scripts ++SUBDIRS = $(subdirs) src docs data scripts + EXTRA_DIST = \ + ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \ + ChangeLog.5 ChangeLog.6 ChangeLog.7 ChangeLog.8 ChangeLog.9 ChangeLog.10 \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Relicensing of some classes from JODConverter
Hi Cedric As far as I'm concerned, no problem for me on relicensing the parts I contributed to > com/artofsolving/jodconverter/openoffice/connection/AbstractOpenOfficeConnection > com/artofsolving/jodconverter/openoffice/connection/OpenOfficeConfiguration > com/artofsolving/jodconverter/openoffice/connection/OpenOfficeConnection > com/artofsolving/jodconverter/openoffice/connection/OpenOfficeException > com/artofsolving/jodconverter/openoffice/connection/PipeOpenOfficeConnection > com/artofsolving/jodconverter/openoffice/connection/SocketOpenOfficeConnection thanks a lot Laurent ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#59071 Slideshow: allow automatic transitions with sub-se...
Hi, On 04/03/2013 12:51 PM, Michael Meeks wrote: > > Having said that the 'Rehearse Timings' thing shows up a small > semi-transparent window on the left that (I assume) should contain some > legend and/or time counter [ click-to-save or something ? ] - that is > currently empty/white for me (which is odd ;-). > > I confirm it is currently empty for me on master, which must be a bug! ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#58807 bring Beep() for basic back
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3185
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/3185/1
fdo#58807 bring Beep() for basic back
The functionality was removed by fdo#48549.
This partially reverts
0f6101cfef4c2e45d9f1f1b3a61ef94799e4526b
0bdf6fc7c71c4c49e6d6f83d56ac953272ad16d5
85cb9084533605657aca0394afe4516058a8e4ef
I changed the behavior to always beep, because only the basic macro
function is using Beep(). Looks like the Beep macro function didn't
even work correctly before the removal, because the default was to
not beep for most platforms. So I set the volume from disable (0)
to 50% for XBell().
Reviewed-on: https://gerrit.libreoffice.org/3124
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
(cherry picked from commit 47664d3f2e12649d324b031ca6ffd5589fe3d197)
Conflicts:
vcl/inc/headless/svpframe.hxx
Change-Id: I663ffb7af75d2fd6d2c1f94073e4412d9744de4a
---
M basic/source/runtime/methods.cxx
M vcl/Library_vcl.mk
M vcl/Package_inc.mk
M vcl/aqua/source/window/salframe.cxx
M vcl/headless/svpframe.cxx
M vcl/inc/aqua/salframe.h
M vcl/inc/headless/svpframe.hxx
M vcl/inc/salframe.hxx
M vcl/inc/unx/gtk/gtkframe.hxx
M vcl/inc/unx/saldisp.hxx
M vcl/inc/unx/salframe.h
A vcl/inc/vcl/sound.hxx
M vcl/inc/win/salframe.h
A vcl/source/app/sound.cxx
M vcl/unx/generic/app/saldisp.cxx
M vcl/unx/generic/window/salframe.cxx
M vcl/unx/gtk/window/gtkframe.cxx
M vcl/win/source/window/salframe.cxx
18 files changed, 132 insertions(+), 3 deletions(-)
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index e09f447..858f844 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -4215,6 +4216,7 @@
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
+Sound::Beep();
}
RTLFUNC(Load)
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index a05e39b..8f12d2c 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -117,6 +117,7 @@
vcl/source/app/session \
vcl/source/app/settings \
vcl/source/app/solarmutex \
+vcl/source/app/sound \
vcl/source/app/stdtext \
vcl/source/app/svapp \
vcl/source/app/svdata \
diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk
index 53a7326..48d996d 100644
--- a/vcl/Package_inc.mk
+++ b/vcl/Package_inc.mk
@@ -126,6 +126,7 @@
$(eval $(call
gb_Package_add_file,vcl_inc,inc/vcl/settings.hxx,vcl/settings.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/slider.hxx,vcl/slider.hxx))
$(eval $(call
gb_Package_add_file,vcl_inc,inc/vcl/solarmutex.hxx,vcl/solarmutex.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sound.hxx,vcl/sound.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spinfld.hxx,vcl/spinfld.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.h,vcl/spin.h))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.hxx,vcl/spin.hxx))
diff --git a/vcl/aqua/source/window/salframe.cxx
b/vcl/aqua/source/window/salframe.cxx
index d2e616c..12cbb91 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1339,6 +1339,13 @@
// ---
+void AquaSalFrame::Beep()
+{
+NSBeep();
+}
+
+// ---
+
void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight,
sal_uInt16 nFlags)
{
if ( !mpWindow )
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 0d4e466..5827d51 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -419,6 +419,10 @@
{
}
+void SvpSalFrame::Beep()
+{
+}
+
const SystemEnvData* SvpSalFrame::GetSystemData() const
{
return &m_aSystemChildData;
diff --git a/vcl/inc/aqua/salframe.h b/vcl/inc/aqua/salframe.h
index e6dcde3..39d9496 100644
--- a/vcl/inc/aqua/salframe.h
+++ b/vcl/inc/aqua/salframe.h
@@ -138,6 +138,7 @@
virtual sal_BoolMapUnicodeToKeyCode( sal_Unicode aUnicode,
LanguageType aLangType, KeyCode& rKeyCode );
virtual LanguageTypeGetInputLanguage();
virtual voidUpdateSettings( AllSettings& rSettings );
+virtual voidBeep();
virtual const SystemEnvData*GetSystemData() const;
virtual SalPointerState GetPointerState();
virtual SalIndicatorState GetIndicatorState();
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index c48d602..887e182 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -102,11 +102,12 @@
virtual voidSync();
virtual voidSetInputContext( SalInputContext* pContext );
virtual voidEndExtTextInput( sal_uInt16 nFlags );
-virtual rtl::OUString G
[Libreoffice-commits] core.git: Branch 'resf/for/master' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ABANDONED] fdo#58807 bring Beep() for basic back
Thomas Arnhold has abandoned this change. Change subject: fdo#58807 bring Beep() for basic back .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/3184 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I176dc5a18b8ceec467946f4544418f502880c611 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#58807 bring Beep() for basic back
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3184
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/84/3184/1
fdo#58807 bring Beep() for basic back
The functionality was removed by fdo#48549.
This partially reverts
0f6101cfef4c2e45d9f1f1b3a61ef94799e4526b
0bdf6fc7c71c4c49e6d6f83d56ac953272ad16d5
85cb9084533605657aca0394afe4516058a8e4ef
I changed the behavior to always beep, because only the basic macro
function is using Beep(). Looks like the Beep macro function didn't
even work correctly before the removal, because the default was to
not beep for most platforms. So I set the volume from disable (0)
to 50% for XBell().
Reviewed-on: https://gerrit.libreoffice.org/3124
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
Conflicts:
vcl/inc/headless/svpframe.hxx
Change-Id: I176dc5a18b8ceec467946f4544418f502880c611
---
M basic/source/runtime/methods.cxx
M vcl/Library_vcl.mk
M vcl/Package_inc.mk
M vcl/aqua/source/window/salframe.cxx
M vcl/headless/svpframe.cxx
M vcl/inc/aqua/salframe.h
M vcl/inc/headless/svpframe.hxx
M vcl/inc/salframe.hxx
M vcl/inc/unx/gtk/gtkframe.hxx
M vcl/inc/unx/saldisp.hxx
M vcl/inc/unx/salframe.h
A vcl/inc/vcl/sound.hxx
M vcl/inc/win/salframe.h
A vcl/source/app/sound.cxx
M vcl/unx/generic/app/saldisp.cxx
M vcl/unx/generic/window/salframe.cxx
M vcl/unx/gtk/window/gtkframe.cxx
M vcl/win/source/window/salframe.cxx
18 files changed, 132 insertions(+), 3 deletions(-)
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index e09f447..858f844 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -4215,6 +4216,7 @@
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
+Sound::Beep();
}
RTLFUNC(Load)
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index a05e39b..8f12d2c 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -117,6 +117,7 @@
vcl/source/app/session \
vcl/source/app/settings \
vcl/source/app/solarmutex \
+vcl/source/app/sound \
vcl/source/app/stdtext \
vcl/source/app/svapp \
vcl/source/app/svdata \
diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk
index 53a7326..48d996d 100644
--- a/vcl/Package_inc.mk
+++ b/vcl/Package_inc.mk
@@ -126,6 +126,7 @@
$(eval $(call
gb_Package_add_file,vcl_inc,inc/vcl/settings.hxx,vcl/settings.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/slider.hxx,vcl/slider.hxx))
$(eval $(call
gb_Package_add_file,vcl_inc,inc/vcl/solarmutex.hxx,vcl/solarmutex.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sound.hxx,vcl/sound.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spinfld.hxx,vcl/spinfld.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.h,vcl/spin.h))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.hxx,vcl/spin.hxx))
diff --git a/vcl/aqua/source/window/salframe.cxx
b/vcl/aqua/source/window/salframe.cxx
index d2e616c..12cbb91 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1339,6 +1339,13 @@
// ---
+void AquaSalFrame::Beep()
+{
+NSBeep();
+}
+
+// ---
+
void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight,
sal_uInt16 nFlags)
{
if ( !mpWindow )
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 0d4e466..5827d51 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -419,6 +419,10 @@
{
}
+void SvpSalFrame::Beep()
+{
+}
+
const SystemEnvData* SvpSalFrame::GetSystemData() const
{
return &m_aSystemChildData;
diff --git a/vcl/inc/aqua/salframe.h b/vcl/inc/aqua/salframe.h
index e6dcde3..39d9496 100644
--- a/vcl/inc/aqua/salframe.h
+++ b/vcl/inc/aqua/salframe.h
@@ -138,6 +138,7 @@
virtual sal_BoolMapUnicodeToKeyCode( sal_Unicode aUnicode,
LanguageType aLangType, KeyCode& rKeyCode );
virtual LanguageTypeGetInputLanguage();
virtual voidUpdateSettings( AllSettings& rSettings );
+virtual voidBeep();
virtual const SystemEnvData*GetSystemData() const;
virtual SalPointerState GetPointerState();
virtual SalIndicatorState GetIndicatorState();
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index c48d602..887e182 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -102,11 +102,12 @@
virtual voidSync();
virtual voidSetInputContext( SalInputContext* pContext );
virtual voidEndExtTextInput( sal_uInt16 nFlags );
-virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode );
-virtual sal_Bool
[Libreoffice-commits] core.git: configure.ac
configure.ac | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
New commits:
commit 7885f9820d5d1ca80381bf88ea2be537874e5ad5
Author: Thorsten Behrens
Date: Wed Apr 3 13:36:47 2013 +0200
Make 10.6 sdk in XCode 4 setup work in configury.
Change-Id: Ia7393d177a24ec6d5e3c25e487a8d5ae96e3c02a
diff --git a/configure.ac b/configure.ac
index f096cb3..cc24bf0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2558,11 +2558,15 @@ if test "$_os" = "Darwin"; then
CXX="${gccprefix}g++-4.0 $arch
-mmacosx-version-min=$with_macosx_version_min_required -isysroot
$MACOSX_SDK_PATH"
;;
10.6)
-# Is similar logic as above needed? Is it likely somebody
-# has both an older Xcode with the 10.6 SDK and a current
-# Xcode?
-CC="gcc-4.2 $bitness
-mmacosx-version-min=$with_macosx_version_min_required -isysroot
$MACOSX_SDK_PATH"
-CXX="g++-4.2 $bitness
-mmacosx-version-min=$with_macosx_version_min_required -isysroot
$MACOSX_SDK_PATH"
+# did someone copy her 10.6 sdk into xcode 4 (needed on Mountain
Lion)?
+if test "$(echo $MACOSX_SDK_PATH | cut -c1-23)" =
"/Applications/Xcode.app"; then
+CC="`xcrun -find gcc` $bitness
-mmacosx-version-min=$with_macosx_version_min_required -isysroot
$MACOSX_SDK_PATH"
+CXX="`xcrun -find g++` $bitness
-mmacosx-version-min=$with_macosx_version_min_required -isysroot
$MACOSX_SDK_PATH"
+XCRUN=xcrun
+else
+CC="gcc-4.2 $bitness
-mmacosx-version-min=$with_macosx_version_min_required -isysroot
$MACOSX_SDK_PATH"
+CXX="g++-4.2 $bitness
-mmacosx-version-min=$with_macosx_version_min_required -isysroot
$MACOSX_SDK_PATH"
+fi
;;
10.7|10.8)
CC="`xcrun -find clang` $bitness
-mmacosx-version-min=$with_macosx_version_min_required -isysroot
$MACOSX_SDK_PATH"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'resf/for/master'
New branch 'resf/for/master' available with the following commits: commit ea754641253f7c02d0c8e6df2bad977229023038 Author: Krisztian Pinter Date: Fri Mar 22 21:08:31 2013 +0100 fdo#39445 writing out tools/fsys.hxx (idl) Removed uses of fsys from database.cxx, command.cxx, module.cxx, svidl.cxx. Also removed a lot of cruft from svidl.cxx and command.hxx; unused variables and code relating to them, eg. variables aCxxFile, aHxxFile, aSrcFile, aODLFile. Changed some Strings to OUStrings in svidl.cxx and command.hxx. Change-Id: I708284f70435c8f65cdcfc954af43976e28b8c9d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Removing C++ SDK examples, clearly encouraging Python extensions (was: LibreOffice prints on tuesdays)
Bjoern Michaelsen wrote: > > Bjoern Michaelsen wrote: > > > As for IDEs: Actually I dont think that many Python stuff is done in > > > a IDE -- most is simply written in an editor. > > and: > There is no dominant IDE (much less so a crossplatform one) and > there seems to be a lot flux on which IDE is the en vouge one each > year. > Sure - but still your precondition was wrong to start with, so further arguing the case based on that is pointless. As Michael suggests, let's punt to ESC tomorrow. Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Removing C++ SDK examples, clearly encouraging Python extensions (was: LibreOffice prints on tuesdays)
On Wed, 2013-04-03 at 12:20 +0200, Bjoern Michaelsen wrote: > As much as it it is perverted, I would prefer people to bind their backend Lets discuss this on Thursday in the ESC call :-) ATB, Michael. -- michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Help for widget UI conversion for DialControl class
On Wed, 2013-03-20 at 23:34 -0300, Olivier Hallot wrote: > Hi Guys > > I need help on how to fix the patch I sumbitted to get the Calc cell > alignment tab page to work. My WIP patch is > > https://gerrit.libreoffice.org/#/c/2773/ > > So far I have all widgets displayed except the dial control. I need to > have it shown so that I can finish it and proceed to more code housekeeping. This is resolved now. The custom widget wasn't able to handle resizing (a common problem seeing as it wasn't an issue in fixed size dialogs) so I tweaked it to understand that it could be resized and to use the current size and not the initial size for the area to draw into. > One question I have is: What WB_ bits (VCL's winbits) should I pass to > the DialControl ctor (BTW where is WB_ bits documented, other than > wintypes.hxx?) I don't think they are particularly documented, the interesting ones are WB_BORDER to put a border around a widget and WB_TABSTOP to state that the widget is a target for accepging keyboard focus on tabbing through widgets. The others are generally fairly self-explanatory, e.g. right/left/center alignment and so forth. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#59071 Slideshow: allow automatic transitions with sub-se...
Hi there, On Tue, 2013-04-02 at 16:38 +, Cao Cuong Ngo (via Code Review) > fdo#59071 Slideshow: allow automatic transitions with sub-second ... > Enable slide transition each 0.25 second instead of whole second. Wow ! that is insanely cool - I've wanted this feature since I first started hacking on LibreOffice, but never had the time to get around to implementing it. I wonder - does the recording function (whereby you do a timed run-through the slide-show to record these times) work ? I believe that involves clicking: 'Slide Show' -> 'Rehearse timings' and having the slide transitions set to: "Advance slide automatically after seconds". Having said that the 'Rehearse Timings' thing shows up a small semi-transparent window on the left that (I assume) should contain some legend and/or time counter [ click-to-save or something ? ] - that is currently empty/white for me (which is odd ;-). I really wanted this to allow slides to be overlayed on an synchronised with multi-slide music (which I believe was also implemented in recent time), for a compelling automatic presentation. Thanks so much for that ! 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] core.git: configure.ac
configure.ac | 41 + 1 file changed, 25 insertions(+), 16 deletions(-) New commits: commit be21cd2bd2f0eeed4ab0fb600dd75f10a0593c23 Author: Thorsten Behrens Date: Wed Apr 3 12:48:54 2013 +0200 Be more serious with our 10.6 baseline on OSX Change-Id: Ic9e2970a29e387dc85972dc97a66e1dc47913a05 diff --git a/configure.ac b/configure.ac index 1f4e2b1..f096cb3 100644 --- a/configure.ac +++ b/configure.ac @@ -1930,7 +1930,7 @@ AC_ARG_WITH(macosx-sdk, [ Usage: --with-macosx-sdk= - e. g.: --with-macosx-sdk=10.4 + e. g.: --with-macosx-sdk=10.6 there are 3 options to control the MacOSX build: --with-macosx-sdk (refered as 'sdk' below) @@ -1945,10 +1945,10 @@ AC_ARG_WITH(macosx-sdk, command line || config result == min | max | sdk || min | max | sdk | - ?| ?| ?|| 10.4 | 10.s | 10.s | - ?| ?| 10.x || 10.4 | 10.x | 10.x | - ?| 10.x | ?|| 10.4 | 10.s | 10.s | - ?| 10.x | 10.y || 10.4 | 10.x | 10.y | + ?| ?| ?|| 10.6 | 10.s | 10.s | + ?| ?| 10.x || 10.6 | 10.x | 10.x | + ?| 10.x | ?|| 10.6 | 10.s | 10.s | + ?| 10.x | 10.y || 10.6 | 10.x | 10.y | 10.x | ?| ?|| 10.x | 10.s | 10.s | 10.x | ?| 10.y || 10.x | 10.y | 10.y | 10.x | 10.y | ?|| 10.x | 10.y | 10.y | @@ -1975,7 +1975,7 @@ AC_ARG_WITH(macosx-version-min-required, [ Usage: --with-macosx-version-min-required= - e. g.: --with-macos-version-min-required=10.4 + e. g.: --with-macos-version-min-required=10.6 see --with-macosx-sdk for more info ], ,) @@ -2363,12 +2363,9 @@ if test "$_os" = "Darwin"; then BITNESS_OVERRIDE=64 fi -# If no --with-macosx-sdk option is given, first look for the 10.4u -# SDK (which is distributed with the obsolete Xcode 3), then the -# 10.6, 10.7 and 10.8 SDKs, in that order. (Don't bother looking -# for the 10.5 SDK, unlikely somebody would have that but not -# 10.6, I think.) If not found in some (old) default locations, -# try the xcode-select tool. +# If no --with-macosx-sdk option is given, look for 10.6, 10.7 +# and 10.8 SDKs, in that order. If not found in some (old) +# default locations, try the xcode-select tool. # The intent is that for "most" Mac-based developers, a suitable # SDK will be found automatically without any configure options. @@ -2513,15 +2510,27 @@ if test "$_os" = "Darwin"; then case "$with_macosx_sdk" in 10.4) ;; +10.6) +;; +*) +AC_MSG_WARN([Building with a SDK > 10.6 possibly breaks 10.6 compatibility. Do not use for the TDF build]) +add_warning "Building with a SDK > 10.6 possibly breaks 10.6 compatibility. Do not use for the TDF build" +;; +esac +;; +10.6) +case "$with_macosx_sdk" in +10.6) +;; *) -AC_MSG_WARN([Building with a SDK > 10.4 possibly breaks 10.4 compatibility. Do not use for the TDF build]) -add_warning "Building with a SDK > 10.4 possibly breaks 10.4 compatibility. Do not use for the TDF build" +AC_MSG_WARN([Building with a SDK > 10.6 possibly breaks 10.6 compatibility. Do not use for the TDF build]) +add_warning "Building with a SDK > 10.6 possibly breaks 10.6 compatibility. Do not use for the TDF build" ;; esac ;; *) -AC_MSG_WARN([Building with a minimum version requirement > 10.4 breaks 10.4 compatibility. Do not use for the TDF build]) -add_warning "Building with a minimum version requirement > 10.4 breaks 10.4 compatibility. Do not use for the TDF build" +AC_MSG_WARN([Building with a minimum version requirement > 10.6 breaks 10.6 compatibility. Do not use for the TDF build]) +add_warning "Building with a minimum version requirement > 10.6 breaks 10.6 compatibility. Do not use for the TDF build" ;; esac fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
