svn commit: r1556461 - /openoffice/trunk/main/sfx2/source/dialog/mgetempl.cxx
Author: hanya
Date: Wed Jan 8 08:11:15 2014
New Revision: 1556461
URL: http://svn.apache.org/r1556461
Log:
#i18109# pre-select the name in new style dialog
Modified:
openoffice/trunk/main/sfx2/source/dialog/mgetempl.cxx
Modified: openoffice/trunk/main/sfx2/source/dialog/mgetempl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/dialog/mgetempl.cxx?rev=1556461r1=1556460r2=1556461view=diff
==
--- openoffice/trunk/main/sfx2/source/dialog/mgetempl.cxx (original)
+++ openoffice/trunk/main/sfx2/source/dialog/mgetempl.cxx Wed Jan 8 08:11:15
2014
@@ -494,6 +494,7 @@ void SfxManageStyleSheetPage::Reset( con
if ( sCmp != aName )
pStyle-SetName( aName );
aNameEd.SetText( aName );
+ aNameEd.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
if ( aFollowLb.IsEnabled() )
{
svn commit: r1556463 - /openoffice/trunk/main/framework/source/uielement/uicommanddescription.cxx
Author: hanya
Date: Wed Jan 8 08:36:06 2014
New Revision: 1556463
URL: http://svn.apache.org/r1556463
Log:
#i118909# fix empty elements of return value in
UICategoryDescription::getElementNames
Modified:
openoffice/trunk/main/framework/source/uielement/uicommanddescription.cxx
Modified:
openoffice/trunk/main/framework/source/uielement/uicommanddescription.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/framework/source/uielement/uicommanddescription.cxx?rev=1556463r1=1556462r2=1556463view=diff
==
--- openoffice/trunk/main/framework/source/uielement/uicommanddescription.cxx
(original)
+++ openoffice/trunk/main/framework/source/uielement/uicommanddescription.cxx
Wed Jan 8 08:36:06 2014
@@ -761,7 +761,7 @@ throw (::com::sun::star::uno::RuntimeExc
ModuleToCommandFileMap::const_iterator pIter =
m_aModuleToCommandFileMap.begin();
while ( pIter != m_aModuleToCommandFileMap.end() )
{
-aSeq[n] = pIter-first;
+aSeq[n++] = pIter-first;
++pIter;
}
buildbot success in ASF Buildbot on openoffice-linux64-nightly
Hi! , The openoffice-linux64-nightly builder has just completed a run STATUS: Success Build revision 1556437 on branch openoffice/trunk Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: tethys_ubuntu Build results at: http://ci.apache.org/builders/openoffice-linux64-nightly/builds/853 Build reason was: The Nightly scheduler named 'openoffice-linux64-nightly' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
svn commit: r1556469 - in /openoffice/trunk/main/writerfilter: inc/ooxml/OOXMLDocument.hxx source/ooxml/OOXMLDocumentImpl.cxx source/ooxml/OOXMLDocumentImpl.hxx
Author: hdu
Date: Wed Jan 8 09:02:05 2014
New Revision: 1556469
URL: http://svn.apache.org/r1556469
Log:
#i123693# WaE: const type qualifier ignored on return value
this fix removes another 70 warnings when building with a newer gcc
Modified:
openoffice/trunk/main/writerfilter/inc/ooxml/OOXMLDocument.hxx
openoffice/trunk/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
openoffice/trunk/main/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
Modified: openoffice/trunk/main/writerfilter/inc/ooxml/OOXMLDocument.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/inc/ooxml/OOXMLDocument.hxx?rev=1556469r1=1556468r2=1556469view=diff
==
--- openoffice/trunk/main/writerfilter/inc/ooxml/OOXMLDocument.hxx (original)
+++ openoffice/trunk/main/writerfilter/inc/ooxml/OOXMLDocument.hxx Wed Jan 8
09:02:05 2014
@@ -242,7 +242,7 @@ public:
virtual uno::Referenceio::XInputStream getInputStreamForId( const
::rtl::OUString rId ) = 0;
virtual void setIDForXNoteStream( const sal_Int32 nID ) = 0;
-virtual const sal_Int32 getIDForXNoteStream() const = 0;
+virtual sal_Int32 getIDForXNoteStream() const = 0;
virtual const ::rtl::OUString getTarget() const = 0;
};
Modified: openoffice/trunk/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx?rev=1556469r1=1556468r2=1556469view=diff
==
--- openoffice/trunk/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
(original)
+++ openoffice/trunk/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx Wed
Jan 8 09:02:05 2014
@@ -132,7 +132,7 @@ void OOXMLDocumentImpl::setIDForXNoteStr
mnIDForXNoteStream = nID;
}
-const sal_Int32 OOXMLDocumentImpl::getIDForXNoteStream() const
+sal_Int32 OOXMLDocumentImpl::getIDForXNoteStream() const
{
return mnIDForXNoteStream;
}
Modified: openoffice/trunk/main/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx?rev=1556469r1=1556468r2=1556469view=diff
==
--- openoffice/trunk/main/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
(original)
+++ openoffice/trunk/main/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx Wed
Jan 8 09:02:05 2014
@@ -120,7 +120,7 @@ public:
virtual uno::Referenceio::XInputStream getInputStreamForId(const
rtl::OUString rId);
virtual void setIDForXNoteStream( const sal_Int32 nID );
-virtual const sal_Int32 getIDForXNoteStream() const;
+virtual sal_Int32 getIDForXNoteStream() const;
virtual const ::rtl::OUString getTarget() const;
};
buildbot success in ASF Buildbot on openoffice-linux32-nightly
Hi! , The openoffice-linux32-nightly builder has just completed a run STATUS: Success Build revision 1556437 on branch openoffice/trunk Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-vm2_ubuntu_32bit Build results at: http://ci.apache.org/builders/openoffice-linux32-nightly/builds/611 Build reason was: The Nightly scheduler named 'openoffice-linux32-nightly' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
buildbot success in ASF Buildbot on aoo-win7
Hi! , The aoo-win7 builder has just completed a run STATUS: Success Build revision 1556167 on branch openoffice/trunk Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-win7 Build results at: http://ci.apache.org/builders/aoo-win7/builds/904 Build reason was: The Nightly scheduler named 'aoo-win7-nightly' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
svn commit: r1556520 - in /openoffice/trunk/ext_sources: 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz c441926f3a552ed3e5b274b62e86af16-S
Author: hdu Date: Wed Jan 8 12:57:22 2014 New Revision: 1556520 URL: http://svn.apache.org/r1556520 Log: #i122362# remove stlport4 tarballs from ext_sources now that --without-stlport is mandatory they are not used/needed anymore Removed: openoffice/trunk/ext_sources/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz openoffice/trunk/ext_sources/7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz openoffice/trunk/ext_sources/c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
svn commit: r1556530 - /openoffice/trunk/main/vcl/source/control/menubtn.cxx
Author: hanya
Date: Wed Jan 8 13:51:46 2014
New Revision: 1556530
URL: http://svn.apache.org/r1556530
Log:
#i118357# allow to open recent list of documents in the hole right part of the
open button separated by the vertical line on the Start Center
Modified:
openoffice/trunk/main/vcl/source/control/menubtn.cxx
Modified: openoffice/trunk/main/vcl/source/control/menubtn.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/control/menubtn.cxx?rev=1556530r1=1556529r2=1556530view=diff
==
--- openoffice/trunk/main/vcl/source/control/menubtn.cxx (original)
+++ openoffice/trunk/main/vcl/source/control/menubtn.cxx Wed Jan 8 13:51:46
2014
@@ -161,7 +161,9 @@ void MenuButton::MouseButtonDown( const
{
// if the separated dropdown symbol is hit,
// execute the popup immediately
- if( ! ImplGetSymbolRect().IsInside( rMEvt.GetPosPixel() ) )
+if ( ImplGetSymbolRect().IsEmpty() ||
+( PushButton::ImplHitTestPushButton( this, rMEvt.GetPosPixel() )
+rMEvt.GetPosPixel().X() ImplGetSymbolRect().Left() ) )
{
if ( !mpMenuTimer )
{
svn commit: r1556542 - in /openoffice/trunk/main: sw/inc/ sw/source/core/crsr/ sw/source/core/doc/ sw/source/core/undo/ sw/source/core/unocore/ sw/source/ui/docvw/ sw/source/ui/shells/ sw/source/ui/wr
Author: orw
Date: Wed Jan 8 14:20:43 2014
New Revision: 1556542
URL: http://svn.apache.org/r1556542
Log:
123792: correction for comments/annotations on table cell ranges
Modified:
openoffice/trunk/main/sw/inc/IDocumentMarkAccess.hxx
openoffice/trunk/main/sw/inc/doc.hxx
openoffice/trunk/main/sw/source/core/crsr/annotationmark.cxx
openoffice/trunk/main/sw/source/core/doc/docbm.cxx
openoffice/trunk/main/sw/source/core/doc/doccorr.cxx
openoffice/trunk/main/sw/source/core/undo/undobj.cxx
openoffice/trunk/main/sw/source/core/unocore/unoobj.cxx
openoffice/trunk/main/sw/source/ui/docvw/SidebarWin.cxx
openoffice/trunk/main/sw/source/ui/shells/textfld.cxx
openoffice/trunk/main/sw/source/ui/wrtsh/wrtsh2.cxx
openoffice/trunk/main/xmloff/source/text/txtfldi.cxx
Modified: openoffice/trunk/main/sw/inc/IDocumentMarkAccess.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/IDocumentMarkAccess.hxx?rev=1556542r1=1556541r2=1556542view=diff
==
--- openoffice/trunk/main/sw/inc/IDocumentMarkAccess.hxx (original)
+++ openoffice/trunk/main/sw/inc/IDocumentMarkAccess.hxx Wed Jan 8 14:20:43
2014
@@ -260,7 +260,7 @@ class IDocumentMarkAccess
virtual const_iterator_t findAnnotationMark( const ::rtl::OUString
rName ) const = 0;
// Returns the MarkType used to create the mark
-static MarkType SAL_DLLPUBLIC_EXPORT GetType(const ::sw::mark::IMark
rMark);
+static SAL_DLLPUBLIC_EXPORT MarkType GetType(const ::sw::mark::IMark
rMark);
static SAL_DLLPUBLIC_EXPORT const ::rtl::OUString
GetCrossRefHeadingBookmarkNamePrefix();
static SAL_DLLPUBLIC_EXPORT bool IsLegalPaMForCrossRefHeadingBookmark(
const SwPaM );
Modified: openoffice/trunk/main/sw/inc/doc.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/doc.hxx?rev=1556542r1=1556541r2=1556542view=diff
==
--- openoffice/trunk/main/sw/inc/doc.hxx (original)
+++ openoffice/trunk/main/sw/inc/doc.hxx Wed Jan 8 14:20:43 2014
@@ -1491,18 +1491,32 @@ public:
// wie z.B. die ::com::sun::star::text::Bookmarks oder die
Verzeichnisse.
// JP 22.06.95: ist bMoveCrsr gesetzt, verschiebe auch die Crsr
- // Setzt alles in rOldNode auf rNewPos + Offset
- void CorrAbs( const SwNodeIndex rOldNode, const SwPosition rNewPos,
- const xub_StrLen nOffset = 0, sal_Bool
bMoveCrsr = sal_False );
- // Setzt alles im Bereich von [rStartNode, rEndNode] nach
rNewPos
- void CorrAbs( const SwNodeIndex rStartNode, const SwNodeIndex
rEndNode,
- const SwPosition rNewPos, sal_Bool
bMoveCrsr = sal_False );
- // Setzt alles im Bereich von rRange nach rNewPos
- void CorrAbs( const SwPaM rRange, const SwPosition rNewPos,
- sal_Bool bMoveCrsr = sal_False );
- // Setzt alles in rOldNode auf relative Pos
- void CorrRel( const SwNodeIndex rOldNode, const SwPosition rNewPos,
- const xub_StrLen nOffset = 0, sal_Bool
bMoveCrsr = sal_False );
+// Setzt alles in rOldNode auf rNewPos + Offset
+void CorrAbs(
+const SwNodeIndex rOldNode,
+const SwPosition rNewPos,
+const xub_StrLen nOffset = 0,
+sal_Bool bMoveCrsr = sal_False );
+
+// Setzt alles im Bereich von [rStartNode, rEndNode] nach rNewPos
+void CorrAbs(
+const SwNodeIndex rStartNode,
+const SwNodeIndex rEndNode,
+const SwPosition rNewPos,
+sal_Bool bMoveCrsr = sal_False );
+
+// Setzt alles im Bereich von rRange nach rNewPos
+void CorrAbs(
+const SwPaM rRange,
+const SwPosition rNewPos,
+sal_Bool bMoveCrsr = sal_False );
+
+// Setzt alles in rOldNode auf relative Pos
+void CorrRel(
+const SwNodeIndex rOldNode,
+const SwPosition rNewPos,
+const xub_StrLen nOffset = 0,
+sal_Bool bMoveCrsr = sal_False );
// GliederungsRegeln erfragen / setzen
// -- OD 2005-11-02 #i51089 - TUNING#
Modified: openoffice/trunk/main/sw/source/core/crsr/annotationmark.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/crsr/annotationmark.cxx?rev=1556542r1=1556541r2=1556542view=diff
==
--- openoffice/trunk/main/sw/source/core/crsr/annotationmark.cxx (original)
+++ openoffice/trunk/main/sw/source/core/crsr/annotationmark.cxx Wed Jan 8
14:20:43 2014
@@ -60,6 +60,7 @@ namespace sw { namespace mark
SwTxtFld* pTxtFld =
GetMarkEnd().nNode.GetNode().GetTxtNode()-GetFldTxtAttrAt(
GetMarkEnd().nContent.GetIndex()-1, true );
+ASSERT( pTxtFld != NULL,
svn commit: r1556561 - /openoffice/branches/alg_writerframes/main/sw/source/ui/shells/frmsh.cxx
Author: alg
Date: Wed Jan 8 15:53:47 2014
New Revision: 1556561
URL: http://svn.apache.org/r1556561
Log:
made AreaDialog called from sidebar using more options work
Modified:
openoffice/branches/alg_writerframes/main/sw/source/ui/shells/frmsh.cxx
Modified:
openoffice/branches/alg_writerframes/main/sw/source/ui/shells/frmsh.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/sw/source/ui/shells/frmsh.cxx?rev=1556561r1=1556560r2=1556561view=diff
==
--- openoffice/branches/alg_writerframes/main/sw/source/ui/shells/frmsh.cxx
(original)
+++ openoffice/branches/alg_writerframes/main/sw/source/ui/shells/frmsh.cxx Wed
Jan 8 15:53:47 2014
@@ -1321,17 +1321,21 @@ void SwFrameShell::ExecDrawDlgTextFrame(
SdrModel* pDoc = pView-GetModel();
SfxItemSet aNewAttr(pDoc-GetItemPool());
+// get attributes from FlyFrame
+rSh.GetFlyFrmAttr(aNewAttr);
+
SvxAbstractDialogFactory* pFact =
SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, Dialogdiet Factory fail!);
AbstractSvxAreaTabDialog * pDlg =
pFact-CreateSvxAreaTabDialog(
NULL,
aNewAttr,
pDoc,
-false);
+false);
DBG_ASSERT(pDlg, Dialogdiet fail!);
if(RET_OK == pDlg-Execute())
{
+// set attributes at FlyFrame
rSh.SetFlyFrmAttr(const_cast SfxItemSet
(*pDlg-GetOutputItemSet()));
static sal_uInt16 __READONLY_DATA aInval[] =
buildbot success in ASF Buildbot on aoo-w7snap
Hi! , The aoo-w7snap builder has just completed a run STATUS: Success Build revision 1556251 on branch None Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-win7 Build results at: http://ci.apache.org/builders/aoo-w7snap/builds/109 Build reason was: forced: by IRC user hdu_hh on channel #asftest: rebuild after SNAPSHOT tag was updated Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
svn commit: r1556567 - /openoffice/branches/alg_writerframes/main/cui/source/tabpages/tparea.cxx
Author: alg
Date: Wed Jan 8 16:21:53 2014
New Revision: 1556567
URL: http://svn.apache.org/r1556567
Log:
corrected relationship when area bitmap fill (textured) between
tile/autofit/position and offset, allow position when non-tile and non-autofit
Modified:
openoffice/branches/alg_writerframes/main/cui/source/tabpages/tparea.cxx
Modified:
openoffice/branches/alg_writerframes/main/cui/source/tabpages/tparea.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/cui/source/tabpages/tparea.cxx?rev=1556567r1=1556566r2=1556567view=diff
==
--- openoffice/branches/alg_writerframes/main/cui/source/tabpages/tparea.cxx
(original)
+++ openoffice/branches/alg_writerframes/main/cui/source/tabpages/tparea.cxx
Wed Jan 8 16:21:53 2014
@@ -2338,10 +2338,14 @@ IMPL_LINK( SvxAreaTabPage, ModifyTileHdl
// allow positioning
aCtlPosition.Enable();
aCtlPosition.Invalidate();
+
+// allow offsets
aFtXOffset.Enable();
aMtrFldXOffset.Enable();
aFtYOffset.Enable();
aMtrFldYOffset.Enable();
+
+// allow 'Position title
aFlPosition.Enable();
// allow size definitions
@@ -2365,16 +2369,20 @@ IMPL_LINK( SvxAreaTabPage, ModifyTileHdl
aMtrFldOffset.Disable();
aFlOffset.Disable();
+// no need for offsets, only position is supported in non-tiled
+aFtXOffset.Disable();
+aMtrFldXOffset.Disable();
+aFtYOffset.Disable();
+aMtrFldYOffset.Disable();
+
if( aTsbStretch.GetState() != STATE_NOCHECK )
{
// non-tiled, stretched
// no need for positioning
aCtlPosition.Disable();
aCtlPosition.Invalidate();
-aFtXOffset.Disable();
-aMtrFldXOffset.Disable();
-aFtYOffset.Disable();
-aMtrFldYOffset.Disable();
+
+// no need for 'Position title, all deactivated
aFlPosition.Disable();
// no need for size definitions
@@ -2392,10 +2400,8 @@ IMPL_LINK( SvxAreaTabPage, ModifyTileHdl
// allow positioning
aCtlPosition.Enable();
aCtlPosition.Invalidate();
-aFtXOffset.Enable();
-aMtrFldXOffset.Enable();
-aFtYOffset.Enable();
-aMtrFldYOffset.Enable();
+
+// allow 'Position title, positioning is active
aFlPosition.Enable();
// allow size definitions
svn commit: r1556574 - /openoffice/trunk/main/solenv/bin/srcrelease.xml
Author: jsc Date: Wed Jan 8 16:44:22 2014 New Revision: 1556574 URL: http://svn.apache.org/r1556574 Log: adapt src release version number Modified: openoffice/trunk/main/solenv/bin/srcrelease.xml Modified: openoffice/trunk/main/solenv/bin/srcrelease.xml URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/srcrelease.xml?rev=1556574r1=1556573r2=1556574view=diff == --- openoffice/trunk/main/solenv/bin/srcrelease.xml (original) +++ openoffice/trunk/main/solenv/bin/srcrelease.xml Wed Jan 8 16:44:22 2014 @@ -27,7 +27,7 @@ property name=out.dir value=./ property name=aoo.name value=apache-openoffice/ property name=aoo.short.name value=aoo/ - property name=aoo.ver value=4.0.0/ + property name=aoo.ver value=4.1.0/ property name=excludes.list value=configure, moz/zipped/*.zip, **/.svn **/.gitignore, **/.git, warn, set_soenv, solver/**, makefile.mk, config.log, config.parms, config.status, bootstrap, autom4te.cache/**, MacOSXX86Env.*, external/unowinreg/unowinreg.dll / property name=excludes.executables value=solenv/bin/macosx-create-bundle, solenv/bin/linkoo, solenv/bin/localize, solenv/bin/createpdbrelocators, solenv/bin/langwrap, solenv/bin/makedepn, solenv/bin/packmodule, solenv/bin/rpm-wrapper, solenv/bin/relocate, solenv/bin/receditor, solenv/bin/subsequenttests, **/*.sh, **/*.bat, **/*.exe, configure.cmd, oowintool, config.sub, config.guess, **/*.pl/
svn commit: r1556579 - in /openoffice/trunk/main: avmedia/source/quicktime/ postprocess/packcomponents/ scp2/source/ooo/ solenv/doc/gbuild/solenv/gbuild/ solenv/gbuild/ vcl/ vcl/util/
Author: hdu
Date: Wed Jan 8 17:03:23 2014
New Revision: 1556579
URL: http://svn.apache.org/r1556579
Log:
#i114728# the quicktime framework is is no longer available in OSX SDKs=10.7
Modified:
openoffice/trunk/main/avmedia/source/quicktime/makefile.mk
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
openoffice/trunk/main/scp2/source/ooo/makefile.mk
openoffice/trunk/main/solenv/doc/gbuild/solenv/gbuild/types.mk
openoffice/trunk/main/solenv/gbuild/LinkTarget.mk
openoffice/trunk/main/vcl/Library_vcl.mk
openoffice/trunk/main/vcl/util/makefile.mk
Modified: openoffice/trunk/main/avmedia/source/quicktime/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/source/quicktime/makefile.mk?rev=1556579r1=1556578r2=1556579view=diff
==
--- openoffice/trunk/main/avmedia/source/quicktime/makefile.mk (original)
+++ openoffice/trunk/main/avmedia/source/quicktime/makefile.mk Wed Jan 8
17:03:23 2014
@@ -25,7 +25,8 @@ PRJ=..$/..
PRJNAME=avmedia
TARGET=avmediaQuickTime
-.IF $(GUIBASE)==aqua
+# the QuickTime API has been removed in OSX SDK 10.7
+.IF $(GUIBASE)==aqua ${MACOSX_DEPLOYMENT_TARGET:s/.//}107
# --- Settings --
@@ -43,10 +44,10 @@ SLOFILES= \
$(SLO)$/quicktimeuno.obj \
$(SLO)$/manager.obj \
$(SLO)$/window.obj\
- $(SLO)$/framegrabber.obj\
$(SLO)$/player.obj
EXCEPTIONSFILES= \
+ $(SLO)$/framegrabber.obj\
$(SLO)$/quicktimeuno.obj
SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
@@ -87,3 +88,4 @@ $(MISC)/avmediaQuickTime.component .ERRR
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt avmediaQuickTime.component
+
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1556579r1=1556578r2=1556579view=diff
==
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Wed Jan 8
17:03:23 2014
@@ -310,11 +310,13 @@ my_components += \
.IF $(OS) == MACOSX
my_components += \
-avmediaQuickTime \
fps_aqua \
macab1 \
macbe1 \
MacOSXSpell
+.IF ${MACOSX_DEPLOYMENT_TARGET:s/.//}107
+my_components += avmediaQuickTime
+.END
.END
.IF $(OS) == WNT
Modified: openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1556579r1=1556578r2=1556579view=diff
==
--- openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp Wed Jan 8
17:03:23 2014
@@ -586,7 +586,6 @@ End
#endif
#ifdef MACOSX
-#ifdef QUARTZ
File gid_File_Lib_Fps_Aqua
TXT_FILE_BODY;
Styles = (PACKED);
@@ -601,14 +600,15 @@ File gid_File_Lib_MacOSXSpell
Dir = SCP2_OOO_BIN_DIR;
End
+#if MACOSX_DEPLOYMENT_TARGET107
File gid_File_Lib_avmediaQuickTime
TXT_FILE_BODY;
Styles = (PACKED);
Name = LIBNAME(avmediaQuickTime);
Dir = SCP2_OOO_BIN_DIR;
End
-#endif
-#endif
+#endif // MACOSX_DEPLOYMENT_TARGET
+#endif // MACOSX
#ifdef OS2
SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_offi )
Modified: openoffice/trunk/main/scp2/source/ooo/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/makefile.mk?rev=1556579r1=1556578r2=1556579view=diff
==
--- openoffice/trunk/main/scp2/source/ooo/makefile.mk (original)
+++ openoffice/trunk/main/scp2/source/ooo/makefile.mk Wed Jan 8 17:03:23 2014
@@ -306,6 +306,9 @@ SCPDEFS+=-DSYSTEM_LIBJPEG
SCPDEFS+=-DSYSTEM_PANGO
.ENDIF
+.IF ${MACOSX_DEPLOYMENT_TARGET} !=
+SCPDEFS+=-DMACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET:s/.//}
+.ENDIF
# The variables ENABLE_ONLINE_UPDATE, WITHOUT_MATHMLDTD, WITH_CATA_FONTS,
WITH_CATB_FONTS,
# and WITHOUT_PPDS are added (or not) in configure to SCPDEFS.
Modified: openoffice/trunk/main/solenv/doc/gbuild/solenv/gbuild/types.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/doc/gbuild/solenv/gbuild/types.mk?rev=1556579r1=1556578r2=1556579view=diff
==
--- openoffice/trunk/main/solenv/doc/gbuild/solenv/gbuild/types.mk (original)
+++ openoffice/trunk/main/solenv/doc/gbuild/solenv/gbuild/types.mk Wed Jan 8
17:03:23 2014
svn commit: r1556584 - /openoffice/trunk/main/solenv/inc/unxmaccx.mk
Author: hdu Date: Wed Jan 8 17:45:05 2014 New Revision: 1556584 URL: http://svn.apache.org/r1556584 Log: #i122301# set the BUILD64 flag for the 64bit Mac build Modified: openoffice/trunk/main/solenv/inc/unxmaccx.mk Modified: openoffice/trunk/main/solenv/inc/unxmaccx.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/unxmaccx.mk?rev=1556584r1=1556583r2=1556584view=diff == --- openoffice/trunk/main/solenv/inc/unxmaccx.mk (original) +++ openoffice/trunk/main/solenv/inc/unxmaccx.mk Wed Jan 8 17:45:05 2014 @@ -22,6 +22,7 @@ # Mac OSX specific defines PROCESSOR_DEFINES=-DX86_64 +BUILD64=1 DLLPOSTFIX=
svn commit: r1556588 - /openoffice/trunk/main/nss/makefile.mk
Author: hdu Date: Wed Jan 8 17:51:35 2014 New Revision: 1556588 URL: http://svn.apache.org/r1556588 Log: #i122301# use the BUILD64 flag to simplify the NSS makefile Modified: openoffice/trunk/main/nss/makefile.mk Modified: openoffice/trunk/main/nss/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/nss/makefile.mk?rev=1556588r1=1556587r2=1556588view=diff == --- openoffice/trunk/main/nss/makefile.mk (original) +++ openoffice/trunk/main/nss/makefile.mk Wed Jan 8 17:51:35 2014 @@ -56,31 +56,11 @@ BUILD_OPT=1 .EXPORT: BUILD_OPT .ENDIF -.IF $(GUI)==UNX -.IF $(OS)$(COM)==LINUXGCC .IF $(BUILD64)==1 -# force 64-bit buildmode +# force the 64-bit build mode for 64bit targets USE_64:=1 .EXPORT : USE_64 -.ENDIF # $(CPU)==X -.ENDIF # $(OS)$(COM)==LINUXGCC - -.IF $(OS)$(COM)==FREEBSDGCC -.IF $(CPU)==X -# force 64-bit buildmode -USE_64:=1 -.EXPORT : USE_64 -.ENDIF # $(CPU)==X -.ENDIF # $(OS)$(COM)==LINUXGCC - -.IF $(OS)==MACOSX -.IF $(EXTRA_CFLAGS)!= -CPP:=gcc -E $(EXTRA_CFLAGS) -CXX:=g++ $(EXTRA_CFLAGS) -CC:=gcc $(EXTRA_CFLAGS) -.EXPORT : CPP -.ENDIF # $(EXTRA_CFLAGS)!= -.ENDIF # $(OS)==MACOSX +.ENDIF # $(BUILD64)==1 OUT2LIB=mozilla$/dist$/out$/lib$/*$(DLLPOST) @@ -92,8 +72,6 @@ BUILD_ACTION+=FREEBL_NO_DEPEND=1 FREEBL_ PATCH_FILES+=nss_linux.patch .ENDIF -.ENDIF # $(GUI)==UNX - .IF $(GUI)==WNT
svn commit: r1556606 - /openoffice/site/trunk/content/pmc-faqs.mdtext
Author: robweir
Date: Wed Jan 8 18:51:41 2014
New Revision: 1556606
URL: http://svn.apache.org/r1556606
Log:
CMS commit to openoffice by robweir
Modified:
openoffice/site/trunk/content/pmc-faqs.mdtext
Modified: openoffice/site/trunk/content/pmc-faqs.mdtext
URL:
http://svn.apache.org/viewvc/openoffice/site/trunk/content/pmc-faqs.mdtext?rev=1556606r1=1556605r2=1556606view=diff
==
--- openoffice/site/trunk/content/pmc-faqs.mdtext (original)
+++ openoffice/site/trunk/content/pmc-faqs.mdtext Wed Jan 8 18:51:41 2014
@@ -26,7 +26,7 @@ Here are a number of FAQ's about how the
The Project Management Committee (PMC) is the government of the project. The
committee is responsible for the
project and decides what to do and which direction to go.
-br ([see here for more a list of PMC members][1])
+br ([see here for a list of PMC members][1])
# Who is the Admin/Moderator/Owner for X? # {#moderator}
svn commit: r893345 - in /websites/staging/openoffice/trunk/content: ./ pmc-faqs.html
Author: buildbot Date: Wed Jan 8 18:51:44 2014 New Revision: 893345 Log: Staging update by buildbot for openoffice Modified: websites/staging/openoffice/trunk/content/ (props changed) websites/staging/openoffice/trunk/content/pmc-faqs.html Propchange: websites/staging/openoffice/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Wed Jan 8 18:51:44 2014 @@ -1 +1 @@ -1556605 +1556606 Modified: websites/staging/openoffice/trunk/content/pmc-faqs.html == --- websites/staging/openoffice/trunk/content/pmc-faqs.html (original) +++ websites/staging/openoffice/trunk/content/pmc-faqs.html Wed Jan 8 18:51:44 2014 @@ -122,7 +122,7 @@ h1 id=pmcWhat is the PMC?/h1 pThe Project Management Committee (PMC) is the government of the project. The committee is responsible for the project and decides what to do and which direction to go. -br (a href=http://people.apache.org/committers-by-project.html#openoffice-pmc;see here for more a list of PMC members/a)/p +br (a href=http://people.apache.org/committers-by-project.html#openoffice-pmc;see here for a list of PMC members/a)/p h1 id=moderatorWho is the Admin/Moderator/Owner for X?/h1 pAlthough Apache projects have few formal roles, there are some technical subsystems which have admin or similar roles filled by project volunteers. If you
svn commit: r893344 - in /websites/staging/openoffice/trunk/content: ./ pmc-faqs.html
Author: buildbot Date: Wed Jan 8 18:50:48 2014 New Revision: 893344 Log: Staging update by buildbot for openoffice Modified: websites/staging/openoffice/trunk/content/ (props changed) websites/staging/openoffice/trunk/content/pmc-faqs.html Propchange: websites/staging/openoffice/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Wed Jan 8 18:50:48 2014 @@ -1 +1 @@ -1553603 +1556605 Modified: websites/staging/openoffice/trunk/content/pmc-faqs.html == --- websites/staging/openoffice/trunk/content/pmc-faqs.html (original) +++ websites/staging/openoffice/trunk/content/pmc-faqs.html Wed Jan 8 18:50:48 2014 @@ -122,7 +122,7 @@ h1 id=pmcWhat is the PMC?/h1 pThe Project Management Committee (PMC) is the government of the project. The committee is responsible for the project and decides what to do and which direction to go. -br (a href=https://cwiki.apache.org/INFRA/resource-request-faqs.html;see here for more information/a)/p +br (a href=http://people.apache.org/committers-by-project.html#openoffice-pmc;see here for more a list of PMC members/a)/p h1 id=moderatorWho is the Admin/Moderator/Owner for X?/h1 pAlthough Apache projects have few formal roles, there are some technical subsystems which have admin or similar roles filled by project volunteers. If you @@ -130,14 +130,14 @@ have a question with one of these system contact first, before escalating to Apache Infrastructure./p h2 id=mailing-listsMailing lists/h2 pEach mailing list has one or more moderators. Here are moderators for some of the Apache OpenOffice lists. - - announce moderators are Herbert Dürr, Jian Fang Zhang + - announce moderators are Rob Weir, Herbert Dürr, Jian Fang Zhang - commits moderators are Peter Junge, Louis Suárez-Potts - - dev moderators are Dave Barton, Yong Lin Ma, Ian Lynch - - users moderators are Simon Phipps, Dave Barton + - dev moderators are Rob Weir, Dave Barton, Yong Lin Ma, Ian Lynch + - users moderators are Peter Junge, Dave Barton - QA moderators are Peter Junge, Ji Yan, Louis Suárez-Potts, Rob Weir - marketing moderators are Rob Weir, Dave Barton - private (restricted access) moderators are Louis Suárez-Potts, Peter Junge - - security (restricted access)with Dennis Hamilton, Wolf Halton + - security (restricted access)with Rob Weir , Wolf Halton and Juergen Schmidt as members. New members can be added by consensus of the PMC/p pResponsibilities of mailing list moderators include:/p ul @@ -149,7 +149,7 @@ allow the valid messages through./li liWhen needed, escalate technical issues to Infra and privacy issues to the PMC./li /ul h2 id=blogBlog/h2 -pBlog authors: You must be a committer. To establish a Roller account a href=https://cwiki.apache.org/INFRA/resource-request-faqs.html;contact Infrastructure/a. /p +pBlog authors: You must be a committer. To establish a Roller account a href=http://people.apache.org/committers-by-project.html#openoffice-pmc;contact Infrastructure/a. /p table thead tr
buildbot success in ASF Buildbot on openoffice-linux32-snapshot
Hi! , The openoffice-linux32-snapshot builder has just completed a run STATUS: Success Build revision 1556573 on branch None Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-vm3_ubuntu_32bit Build results at: http://ci.apache.org/builders/openoffice-linux32-snapshot/builds/67 Build reason was: forced: by IRC user hdu_hh on channel #asftest: rebuild after SNAPSHOT tag was updated Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
buildbot failure in ASF Buildbot on openoffice-fbsd-nightly
Hi! , The openoffice-fbsd-nightly builder has just completed a run STATUS: Failure Build revision 1556710 on branch openoffice/trunk Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-fbsd2_64bit Build results at: http://ci.apache.org/builders/openoffice-fbsd-nightly/builds/146 Build reason was: The Nightly scheduler named 'openoffice-fbsd-nightly' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
buildbot failure in ASF Buildbot on openoffice-linux32-nightly
Hi! , The openoffice-linux32-nightly builder has just completed a run STATUS: Failure Build revision 1556710 on branch openoffice/trunk Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-vm2_ubuntu_32bit Build results at: http://ci.apache.org/builders/openoffice-linux32-nightly/builds/612 Build reason was: The Nightly scheduler named 'openoffice-linux32-nightly' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
