mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4

Browse Source 
Conflicts:
	svtools/source/control/toolbarmenu.cxx
	vcl/inc/vcl/gdimtf.hxx
	vcl/inc/vcl/settings.hxx
	vcl/unx/inc/saldata.hxx
	vcl/unx/kde4/KDESalGraphics.cxx
This commit is contained in:
Petr Mladek
2011-04-05 19:07:05 +02:00
parent 149bb82c28 ef29f115c0
commit c87019c1a9
6 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
canvas/source/cairo/cairo_canvashelper.cxx
View File

@@ -1079,7 +1079,7 @@ namespace cairocanvas
{
const sal_uInt32 nNextIndex((b + 1) % nPointCount);
aEdge.setB2DPoint(1, aCandidate.getB2DPoint(nNextIndex));
aEdge.setNextControlPoint(0, aCandidate.getNextControlPoint(b));
aEdge.setNextControlPoint(0, aCandidate.getNextControlPoint(b % nPointCount));
aEdge.setPrevControlPoint(1, aCandidate.getPrevControlPoint(nNextIndex));
doPolyPolygonImplementation( basegfx::B2DPolyPolygon(aEdge),

2
unotools/source/config/configmgr.cxx
View File

@@ -379,7 +379,7 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp)
::rtl::OUString sBrandName;
#ifdef ENABLE_BROFFICE
LanguageType nType = MsLangId::getSystemUILanguage();
LanguageType nType = MsLangId::getRealLanguage( LANGUAGE_NONE );
if ( nType == LANGUAGE_PORTUGUESE_BRAZILIAN )
sBrandName = OUString(RTL_CONSTASCII_USTRINGPARAM("BrOffice"));
else

8
unotools/source/misc/fontdefs.cxx
View File

@@ -91,6 +91,10 @@ static sal_Unicode const aIPAPMincho[] = { 'i', 'p', 'a', 'p', 0x660E, 0x671D, 0
static sal_Unicode const aIPAGothic[] = { 'i', 'p', 'a', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
static sal_Unicode const aIPAPGothic[] = { 'i', 'p', 'a', 'p', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
static sal_Unicode const aIPAUIGothic[] = { 'i', 'p', 'a', 'u', 'i', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
static sal_Unicode const aTakaoMincho[] = { 't', 'a', 'k', 'a', 'o', 0x660E, 0x671D, 0 };
static sal_Unicode const aTakaoPMincho[] = { 't', 'a', 'k', 'a', 'o', 'p', 0x660E, 0x671D, 0 };
static sal_Unicode const aTakaoGothic[] = { 't', 'a', 'k', 'a', 'o', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
static sal_Unicode const aTakaoPGothic[] = { 't', 'a', 'k', 'a', 'o', 'p', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
static sal_Unicode const aSazanamiMincho[] = { 0x3055, 0x3056, 0x306A, 0x307F, 0x660E, 0x671D, 0, 0 };
static sal_Unicode const aSazanamiGothic[] = { 0x3055, 0x3056, 0x306A, 0x307F, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0, 0 };
static sal_Unicode const aKochiMincho[] = { 0x6771, 0x98A8, 0x660E, 0x671D, 0, 0 };
@@ -236,6 +240,10 @@ static ImplLocalizedFontName aImplLocalizedNamesList[] =
{ "ipagothic", aIPAGothic },
{ "ipapgothic", aIPAPGothic },
{ "ipauigothic", aIPAUIGothic },
{ "takaomincho", aTakaoMincho },
{ "takaopmincho", aTakaoPMincho },
{ "takaogothic", aTakaoGothic },
{ "takaopgothic", aTakaoPGothic },
{ "sazanamimincho", aSazanamiMincho },
{ "sazanamigothic", aSazanamiGothic },
{ "kochimincho", aKochiMincho },

2
vcl/source/gdi/gdimtf.cxx
View File

@@ -439,6 +439,8 @@ void GDIMetaFile::Play( GDIMetaFile& rMtf, sal_uLong nPos )
rMtf.UseCanvas( rMtf.GetUseCanvas() || bUseCanvas );
rMtf.UseCanvas( rMtf.GetUseCanvas() || bUseCanvas );
if( nPos > nObjCount )
nPos = nObjCount;

2
vcl/unx/kde4/KDESalGraphics.cxx
View File

@@ -433,6 +433,8 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
const int width = kapp->style()->pixelMetric(QStyle::PM_ToolBarHandleExtent);
QRect rect( 0, 0, width, widgetRect.height());
clipRegion = new QRegion( widgetRect.x(), widgetRect.y(), width, widgetRect.height());
XRectangle xRect = { widgetRect.x(), widgetRect.y(), width, widgetRect.height() };
XUnionRectWithRegion( &xRect, pTempClipRegion, pTempClipRegion );
QStyleOption option;
option.state = QStyle::State_Horizontal;

10
vcl/unx/kde4/KDEXLib.cxx
View File

@@ -219,6 +219,16 @@ static bool qt_event_filter( void* m )
return false;
}
static bool ( *old_qt_event_filter )( void* );
static bool qt_event_filter( void* m )
{
if( old_qt_event_filter != NULL && old_qt_event_filter( m ))
return true;
if( SalKDEDisplay::self() && SalKDEDisplay::self()->checkDirectInputEvent( static_cast< XEvent* >( m )))
return true;
return false;
}
void KDEXLib::setupEventLoop()
{
old_qt_event_filter = QAbstractEventDispatcher::instance()->setEventFilter( qt_event_filter );