[Libreoffice-commits] .: 2 commits - configure.in sw/source
configure.in |2 +-
sw/source/core/doc/docsort.cxx |2 +-
sw/source/ui/app/appopt.cxx|2 +-
sw/source/ui/app/docshini.cxx |2 +-
sw/source/ui/dbui/dbmgr.cxx|2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit cddea419b645c11819b9314acb95d8ea8df4fc98
Author: Tomas Chvatal
Date: Sat Sep 24 18:08:24 2011 +0200
Avoid ambiguous Locale type by specifying full path to sun::star... ; the
other definition is from ICU.
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index 6a65b32..d76dcec 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -64,7 +64,7 @@ SwSortOptions* SwSortElement::pOptions = 0;
SwDoc* SwSortElement::pDoc = 0;
const FlatFndBox* SwSortElement::pBox = 0;
CollatorWrapper*SwSortElement::pSortCollator = 0;
-Locale* SwSortElement::pLocale = 0;
+com::sun::star::lang::Locale* SwSortElement::pLocale = 0;
String* SwSortElement::pLastAlgorithm = 0;
LocaleDataWrapper* SwSortElement::pLclData = 0;
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index 6ab953e..689e875 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -161,7 +161,7 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId )
else
{
SvtLinguConfig aLinguCfg;
-Locale aLocale;
+com::sun::star::lang::Locale aLocale;
LanguageType nLang;
using namespace ::com::sun::star::i18n::ScriptType;
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index f2663d3..5c43206 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -138,7 +138,7 @@ sal_Bool SwDocShell::InitNew( const uno::Reference <
embed::XStorage >& xStor )
Sequence aLocales = aAsian.GetStartEndCharLocales();
if(aLocales.getLength())
{
-const Locale* pLocales = aLocales.getConstArray();
+const com::sun::star::lang::Locale* pLocales =
aLocales.getConstArray();
for(sal_Int32 i = 0; i < aLocales.getLength(); i++)
{
ForbiddenCharacters aForbidden;
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 5ee9fca..2bdd83c 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -1474,7 +1474,7 @@ sal_uLong SwNewDBMgr::GetColumnFmt( uno::Reference<
XDataSource> xSource,
uno::Reference< XNumberFormats > xDocNumberFormats =
xDocNumFmtsSupplier->getNumberFormats();
uno::Reference< XNumberFormatTypes >
xDocNumberFormatTypes(xDocNumberFormats, UNO_QUERY);
-Locale aLocale( MsLangId::convertLanguageToLocale(
(LanguageType)nLanguage ));
+com::sun::star::lang::Locale aLocale(
MsLangId::convertLanguageToLocale( (LanguageType)nLanguage ));
//get the number formatter of the data source
uno::Reference xSourceProps(xSource, UNO_QUERY);
commit 3a8c8537d1c8e03f3587a6823b2f6749b3115c46
Author: Tomas Chvatal
Date: Thu Sep 22 12:52:40 2011 +0200
For wiki-ext check also java and ext support.
diff --git a/configure.in b/configure.in
index 2359334..11f4681 100755
--- a/configure.in
+++ b/configure.in
@@ -7046,7 +7046,7 @@ if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o
"$ENABLE_MINIMIZER" = "YES" -o "$E
fi
AC_MSG_CHECKING([whether to build the Wiki Publisher extension])
-AS_IF([test "x$enable_ext_wiki_publisher" = "xyes"], [
+AS_IF([test "x$enable_ext_wiki_publisher" = "xyes" -a -o
"x$enable_extension_integration" != "xno" -a "$with_java" != "no"], [
AC_MSG_RESULT([yes])
AC_MSG_CHECKING([for swext module])
ENABLE_MEDIAWIKI=YES
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/gbuild_simple.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a45542c6f0df83b270311f188d57bb2b0a51e771 Author: Matúš Kukan Date: Sat Sep 24 15:54:18 2011 +0200 also here include linux-CPUNAME as in gbuild.mk diff --git a/solenv/gbuild/gbuild_simple.mk b/solenv/gbuild/gbuild_simple.mk index 002dd27..5a48ffb 100644 --- a/solenv/gbuild/gbuild_simple.mk +++ b/solenv/gbuild/gbuild_simple.mk @@ -83,7 +83,7 @@ endif include $(GBUILDDIR)/Helper.mk ifeq ($(OS),LINUX) -include $(GBUILDDIR)/platform/linux.mk +include $(GBUILDDIR)/platform/linux-$(CPUNAME).mk else ifeq ($(OS),WNT) ifeq ($(COM),GCC) include $(GBUILDDIR)/platform/winmingw.mk ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - sc/source
sc/source/core/tool/rangeutl.cxx | 29
sc/source/ui/app/inputwin.cxx| 56 ++-
sc/source/ui/namedlg/namedlg.cxx |4 ++
sc/source/ui/navipi/content.cxx | 49 --
4 files changed, 100 insertions(+), 38 deletions(-)
New commits:
commit 7a195b81bee5c84e01186463b44ad3c551046f33
Author: Markus Mohrhard
Date: Sat Sep 24 16:03:49 2011 +0200
Manage Names: braodcast change in range names now directly
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 494a6d0..47ff629 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -45,6 +45,8 @@
#include "namedlg.hxx"
#include "viewdata.hxx"
+#include "sfx2/app.hxx"
+
#include
#include
@@ -472,6 +474,7 @@ bool ScNameDlg::AddPushed()
maBtnAdd.Disable();
maUndoStack.push( new ScNameManagerUndoAdd( pRangeName, new
ScRangeData(*pNewEntry) ));
UpdateNames();
+SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREAS_CHANGED ) );
}
}
else
@@ -506,6 +509,7 @@ void ScNameDlg::RemovePushed()
maUndoStack.push( new ScNameManagerUndoDelete( pRangeName, new
ScRangeData(*pData) ));
pRangeName->erase(*pData);
UpdateNames();
+SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREAS_CHANGED ) );
}
}
}
commit ae992dbe6c2ae729fe69f1b48d4fade7be90e849
Author: Markus Mohrhard
Date: Sat Sep 24 15:48:01 2011 +0200
add local range names to "Name Box"/ScPosWnd
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index d5af7ec..2a0ceb0 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -293,7 +293,6 @@ sal_Bool ScRangeUtil::MakeRangeFromName (
sal_Int32 nEndPos = aName.lastIndexOf(')');
sal_Int32 nStartPos = aName.lastIndexOfAsciiL(" (",2);
SCTAB nTable = nCurTab;
-std::cout << "nStartPos: " << nStartPos << " nEndPos: " << nEndPos <<
std::endl;
if (nEndPos != -1 && nStartPos != -1)
{
rtl::OUString aSheetName = aName.copy(nStartPos+2,
nEndPos-nStartPos-2);
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index c0b0979..6c26f3d 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1810,6 +1810,19 @@ void ScPosWnd::SetPos( const String& rPosStr )
}
}
+namespace {
+
+rtl::OUString createLocalRangeName(const rtl::OUString& rName, const
rtl::OUString& rTableName)
+{
+rtl::OUStringBuffer aString (rName);
+aString.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" (")));
+aString.append(rTableName);
+aString.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
+return aString.makeStringAndClear();
+}
+
+}
+
void ScPosWnd::FillRangeNames()
{
Clear();
@@ -1819,32 +1832,39 @@ void ScPosWnd::FillRangeNames()
{
ScDocument* pDoc = ((ScDocShell*)pObjSh)->GetDocument();
-// per Hand sortieren, weil Funktionen nicht sortiert werden:
-
+ScRange aDummy;
+std::set aSet;
ScRangeName* pRangeNames = pDoc->GetRangeName();
if (!pRangeNames->empty())
{
-ScRange aDummy;
-std::vector aSortArray;
-ScRangeName::const_iterator itr = pRangeNames->begin(), itrEnd =
pRangeNames->end();
-for (; itr != itrEnd; ++itr)
+ScRangeName::const_iterator itrBeg = pRangeNames->begin(), itrEnd
= pRangeNames->end();
+for (ScRangeName::const_iterator itr = itrBeg; itr != itrEnd;
++itr)
{
if (itr->IsValidReference(aDummy))
-aSortArray.push_back(&(*itr));
+aSet.insert(itr->GetName());
}
+}
+for (SCTAB i = 0; i < pDoc->GetTableCount(); ++i)
+{
+ScRangeName* pLocalRangeName = pDoc->GetRangeName(i);
+if (pLocalRangeName && !pLocalRangeName->empty())
+{
+rtl::OUString aTableName;
+pDoc->GetName(i, aTableName);
+for (ScRangeName::const_iterator itr =
pLocalRangeName->begin(); itr != pLocalRangeName->end(); ++itr)
+{
+if (itr->IsValidReference(aDummy))
+aSet.insert(createLocalRangeName(itr->GetName(),
aTableName));
+}
+}
+}
-if (!aSortArray.empty())
+if (!aSet.empty())
+{
+for (std::set::iterator itr = aSet.begin();
+itr != aSet.end(); ++itr)
{
-#ifndef ICC
-size_t n = aSortArray.size();
-qsort( (void*)&aSortArray[0], n, sizeof(ScRangeData*),
-&ScRangeData_QsortNameCompare );
-#else
-qsort( (void*)&aSortArray[0], n, sizeof(ScRangeData*),
-
[Libreoffice-commits] .: unusedcode.easy vcl/inc vcl/source
unusedcode.easy |5
vcl/inc/vcl/print.hxx | 14 -
vcl/source/gdi/print3.cxx | 49 --
3 files changed, 68 deletions(-)
New commits:
commit e1de59eb4661397c888e7fab223710543c541e87
Author: Matúš Kukan
Date: Sat Sep 24 10:36:05 2011 +0200
unusedcode: vcl::PrinterFoo
diff --git a/unusedcode.easy b/unusedcode.easy
index 390fea9..3e7cc88 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -2939,11 +2939,6 @@ vcl::PDFExtOutDevData::SetOutlineItemText(int,
rtl::OUString const&)
vcl::PDFWriter::DrawPixel(Polygon const&, Color const*)
vcl::PDFWriterImpl::drawPolyPolygon(PolyPolygon const&, int, bool)
vcl::PrintDialog::getCopyCount()
-vcl::PrinterController::PrinterController()
-vcl::PrinterController::enableUIOption(rtl::OUString const&, bool)
-vcl::PrinterController::getValues(com::sun::star::uno::Sequence
const&) const
-vcl::PrinterOptionsHelper::hasProperty(rtl::OUString const&) const
-vcl::PrinterOptionsHelper::setValue(rtl::OUString const&,
com::sun::star::uno::Any const&)
vcl::RenderGraphic::RenderGraphic(boost::shared_array const&,
unsigned int, rtl::OUString const&)
vcl::RowOrColumn::remove(Window*)
vcl::RowOrColumn::remove(boost::shared_ptr const&)
diff --git a/vcl/inc/vcl/print.hxx b/vcl/inc/vcl/print.hxx
index 7b92327..d154b04 100644
--- a/vcl/inc/vcl/print.hxx
+++ b/vcl/inc/vcl/print.hxx
@@ -441,7 +441,6 @@ public:
) : aSize( i_rSize ), bFullPaper( i_bFullPaper ) {}
};
-PrinterController();
virtual ~PrinterController();
const boost::shared_ptr& getPrinter() const;
@@ -458,8 +457,6 @@ public:
*/
com::sun::star::beans::PropertyValue* getValue( const rtl::OUString&
i_rPropertyName );
const com::sun::star::beans::PropertyValue* getValue( const rtl::OUString&
i_rPropertyName ) const;
-// get a sequence of properties
-com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >
getValues( const com::sun::star::uno::Sequence< rtl::OUString >& ) const;
/* get a bool property
in case the property is unknown or not convertible to bool, i_bFallback
is returned
*/
@@ -479,7 +476,6 @@ public:
void setUIOptions( const com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue >& );
/* enable/disable an option; this can be used to implement dialog logic.
*/
-void enableUIOption( const rtl::OUString& rPropName, bool bEnable );
bool isUIOptionEnabled( const rtl::OUString& rPropName ) const;
bool isUIChoiceEnabled( const rtl::OUString& rPropName, sal_Int32 nChoice
) const;
/* returns the property name rPropName depends on or an empty string
@@ -570,18 +566,8 @@ class VCL_DLLPUBLIC PrinterOptionsHelper
**/
void appendPrintUIOptions( com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue >& io_rProps ) const;
-// check if a property exists
-bool hasProperty( const rtl::OUString& i_rPropertyName ) const;
-bool hasProperty( const char* i_pPropertyName ) const
-{ return hasProperty( rtl::OUString::createFromAscii( i_pPropertyName ) );
}
-
// returns an empty Any for not existing properties
com::sun::star::uno::Any getValue( const rtl::OUString& i_rPropertyName )
const;
-// change a value in the property set; this will not have an effect to an
eventual PrinterController
-// the user of setValue must decide whether it is necessary to set the
value there also
-void setValue( const rtl::OUString& i_rPropertyName, const
com::sun::star::uno::Any& i_rValue );
-void setValue( const char* i_pPropertyName, const
com::sun::star::uno::Any& i_rValue )
-{ setValue( rtl::OUString::createFromAscii( i_pPropertyName ), i_rValue );
}
sal_Bool getBoolValue( const rtl::OUString& i_rPropertyName, sal_Bool
i_bDefault = sal_False ) const;
// convenience for fixed strings
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index dfe5bfb..6365b20 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -198,11 +198,6 @@ public:
PrinterController::PageSize modifyJobSetup( const Sequence< PropertyValue
>& i_rProps, bool bNoNUP );
};
-PrinterController::PrinterController()
-: mpImplData( new ImplPrinterControllerData )
-{
-}
-
PrinterController::PrinterController( const boost::shared_ptr&
i_pPrinter )
: mpImplData( new ImplPrinterControllerData )
{
@@ -1292,20 +1287,6 @@ const beans::PropertyValue* PrinterController::getValue(
const rtl::OUString& i_
return it != mpImplData->maPropertyToIndex.end() ?
&mpImplData->maUIProperties[it->second] : NULL;
}
-Sequence< beans::PropertyValue > PrinterController::getValues( const Sequence<
rtl::OUString >& i_rNames ) const
-{
-Sequence< beans::PropertyValue > aRet( i_rNames.getLength() );
-sal_Int32 nFound = 0;
-for( sal_Int32 i = 0; i < i_rNames.getLength(); i++ )
-{
-const beans::PropertyValue*
[Libreoffice-commits] .: smoketestoo_native/smoketest.cxx
smoketestoo_native/smoketest.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit cf16ef6c250a2755155a02f24bad861b35a1f92b
Author: Michael Meeks
Date: Sat Sep 24 11:40:10 2011 +0100
add a 30 second timeout to failure if we get no response in this time
diff --git a/smoketestoo_native/smoketest.cxx b/smoketestoo_native/smoketest.cxx
index b77ed70..bb47b26 100644
--- a/smoketestoo_native/smoketest.cxx
+++ b/smoketestoo_native/smoketest.cxx
@@ -197,7 +197,9 @@ void Test::test() {
disp, url, css::uno::Sequence< css::beans::PropertyValue >(),
new Listener(&result)),
css::uno::Any());
-result.condition.wait();
+TimeValue t;
+t.Seconds = 30; t.Nanosec = 0;
+result.condition.wait(&t);
CPPUNIT_ASSERT(result.success);
CPPUNIT_ASSERT_EQUAL(rtl::OUString(), result.result);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/tbxctrls/linectrl.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 24bd2b363a8e9981a3583dfb190161ab335ee870
Author: Michael Meeks
Date: Sat Sep 24 11:33:38 2011 +0100
cleanup debug build pointer -> ref migration issues
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 2d419d2..fe54d1a 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -382,7 +382,6 @@ SvxLineEndWindow::SvxLineEndWindow(
SfxPopupWindow( nSlotId,
rFrame,
WinBits( WB_STDPOPUP ) ),
-pLineEndList(),
aLineEndSet ( this, WinBits( WB_ITEMBORDER | WB_3DLOOK |
WB_NO_DIRECTSELECT ) ),
nCols ( 2 ),
nLines ( 12 ),
@@ -404,7 +403,6 @@ SvxLineEndWindow::SvxLineEndWindow(
rFrame,
pParentWindow,
WinBits( WB_STDPOPUP ) ),
-pLineEndList( NULL ),
aLineEndSet ( this, WinBits( WB_ITEMBORDER | WB_3DLOOK |
WB_NO_DIRECTSELECT ) ),
nCols ( 2 ),
nLines ( 12 ),
@@ -435,7 +433,7 @@ void SvxLineEndWindow::implInit()
if( pItem )
nLineEndWidth = ( (SfxUInt16Item*) pItem )->GetValue();
}
-DBG_ASSERT( pLineEndList, "LineEndList wurde nicht gefunden" );
+DBG_ASSERT( pLineEndList.is(), "LineEndList wurde nicht gefunden" );
aLineEndSet.SetSelectHdl( LINK( this, SvxLineEndWindow, SelectHdl ) );
aLineEndSet.SetColCount( nCols );
@@ -669,7 +667,7 @@ void SvxLineEndWindow::StateChanged(
if ( pState && pState->ISA( SvxLineEndListItem ))
{
pLineEndList = ((SvxLineEndListItem*)pState)->GetLineEndList();
-DBG_ASSERT( pLineEndList, "LineEndList nicht gefunden" );
+DBG_ASSERT( pLineEndList.is(), "LineEndList nicht gefunden" );
aLineEndSet.Clear();
FillValueSet();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/xoutdev/xtable.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit eb2d27548d6db23630032f15985da980c6d53303 Author: Norbert Thiebaud Date: Sat Sep 24 04:14:19 2011 -0500 WaE unused debug-printf static variable diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx index 1aac0d8..100dbe4 100644 --- a/svx/source/xoutdev/xtable.cxx +++ b/svx/source/xoutdev/xtable.cxx @@ -46,7 +46,7 @@ Color RGB_Color( ColorData nColorName ) return aRGBColor; } -static int count = 0; +// static int count = 0; XPropertyList::XPropertyList( XPropertyListType type, ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/xoutdev/xtable.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0f89219ff70eafbea0647ff6902eab22fc11081a
Author: Michael Meeks
Date: Sat Sep 24 08:45:08 2011 +0100
remove some stray debug fprintfs
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index fb0f77a..1aac0d8 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -70,12 +70,12 @@ XPropertyList::XPropertyList(
pXPool = new XOutdevItemPool;
DBG_ASSERT( pXPool, "XOutPool konnte nicht erzeugt werden!" );
}
-fprintf (stderr, "Create type %d count %d\n", (int)eType, count++);
+//fprintf (stderr, "Create type %d count %d\n", (int)eType, count++);
}
XPropertyList::~XPropertyList()
{
-fprintf (stderr, "Destroy type %d count %d\n", (int)eType, --count);
+//fprintf (stderr, "Destroy type %d count %d\n", (int)eType, --count);
for( size_t i = 0, n = aList.size(); i < n; ++i )
delete aList[ i ];
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
